44 files changed, 17943 insertions, 17761 deletions

diff --git a/AUTHORS b/AUTHORS
index 4d82126de..139acae41 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -36,6 +36,8 @@ Gregory Steuck <[email protected]> Translations [ru]
 
 Nagy Ferenc László <[email protected]> Translations [hu]
 
+Ivar Snaaijer <[email protected]>  Translations [nl]
+
 Ivo Timmermans <[email protected]> Translations [nl]
 
 Jacobo Tarri'o Barreiro <[email protected]> Translations [gl]
diff --git a/ChangeLog b/ChangeLog
index 1e27edf30..03efa0c32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-05  Werner Koch  <[email protected]>
+
+	Released 1.4.7.
+
+2007-03-04  David Shaw  <[email protected]>
+
+	* NEWS: Note --allow-multiple-messages.
+
 2006-12-21  David Shaw  <[email protected]>
 
 	* configure.ac: Only check for libusb if we're building with card
diff --git a/NEWS b/NEWS
index def94c272..3166860ce 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,21 @@
-Noteworthy changes in version 1.4.7
+Noteworthy changes in version 1.4.7 (2007-03-05)
 ------------------------------------------------
 
+    * By default, do not allow processing multiple plaintexts in a
+      single stream.  Many programs that called GnuPG were assuming
+      that GnuPG did not permit this, and were thus not using the
+      plaintext boundary status tags that GnuPG provides.  This change
+      makes GnuPG reject such messages by default which makes those
+      programs safe again.  --allow-multiple-messages returns to the
+      old behavior.
+
     * [W32] The environment variable LANGUAGE may be used to override
       the language given by HKCU\Software\GNU\GnuPG:Lang.  The
       language files "*.mo" are expected in a directory named
       "gnupg.nls" below the directory with the gpg.exe binary.
 
+    * New --verify-option show-primary-uid-only. 
+
 
 Noteworthy changes in version 1.4.6 (2006-12-06)
 ------------------------------------------------
@@ -35,7 +45,7 @@ Noteworthy changes in version 1.4.6 (2006-12-06)
       violations pertaining to this issue, including those that may
       have occurred in the past.
 
-    * Man pages are now build from the same source as those of GnuPG-2.
+    * Man pages are now built from the same source as those of GnuPG-2.
 
 
 Noteworthy changes in version 1.4.5 (2006-08-01)
diff --git a/checks/ChangeLog b/checks/ChangeLog
index 790d4b691..cc67e7eaf 100644
--- a/checks/ChangeLog
+++ b/checks/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-04  David Shaw  <[email protected]>
+
+	* verify.test: Use --allow-multiple-messages instead of
+	--allow-multisig-verification.  Two clearsigs in a row counts as a
+	multiple-message test.
+
 2006-12-11  Werner Koch  <[email protected]>
 
 	* verify.test (msg_clsclss_asc): Work around a bug in OpenBSD.
diff --git a/checks/verify.test b/checks/verify.test
index 4f53b9707..3f534d99d 100755
--- a/checks/verify.test
+++ b/checks/verify.test
@@ -121,8 +121,8 @@ IHBlb3BsZS4K
 
 
 # Two standard signed messages in a row
-tests="$tests msg_olsols_asc_multisig"
-msg_olsols_asc_multisig='-----BEGIN PGP MESSAGE-----
+tests="$tests msg_olsols_asc_multiple"
+msg_olsols_asc_multiple='-----BEGIN PGP MESSAGE-----
 
 kA0DAAIRLXJ8x2hpdzQBrQEHYgNtc2dEDFJaSSB0aGluayB0aGF0IGFsbCByaWdo
 dC10aGlua2luZyBwZW9wbGUgaW4gdGhpcyBjb3VudHJ5IGFyZSBzaWNrIGFuZAp0
@@ -215,8 +215,8 @@ EOF
 `
 
 # Two clear text signatures in a row
-tests="$tests msg_clsclss_asc"
-msg_clsclss_asc="${msg_cls_asc}
+tests="$tests msg_clsclss_asc_multiple"
+msg_clsclss_asc_multiple="${msg_cls_asc}
 ${msg_clss_asc}"
 
 
@@ -236,8 +236,8 @@ for i in $tests ; do
     msg_*_asc)
        $GPG --verify x || error "verify of $i failed"
        ;;
-    msg_*_asc_multisig)
-       $GPG --verify --allow-multisig-verification x \
+    msg_*_asc_multiple)
+       $GPG --verify --allow-multiple-messages x \
            || error "verify of $i failed"
        set +x
        $GPG --verify x && error "verify of $i succeeded but should not"
diff --git a/configure.ac b/configure.ac
index c75bf1bed..4167aec94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ min_automake_version="1.9.3"
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
 m4_define([my_version], [1.4.7])
-m4_define([my_issvn], [yes])
+m4_define([my_issvn], [no])
 
 m4_define([svn_revision], m4_esyscmd([echo -n $((svn info 2>/dev/null \
           || echo 'Revision: 0')|sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
diff --git a/doc/gpg.texi b/doc/gpg.texi
index a8e213c95..e70c32341 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1003,6 +1003,11 @@ the signature. Defaults to no.
 Show revoked and expired user IDs during signature verification.
 Defaults to no.
 
+@item show-primary-uid-only
+Show only the primary user ID during signature verification.  That is
+all the AKA lines as well as photo Ids are not shown with the signature
+verification status.
+
 @item pka-lookups
 Enable PKA lookups to verify sender addresses. Note that PKA is based
 on DNS, and so enabling this option may disclose information on when
@@ -1076,18 +1081,23 @@ not used).
 @include opt-homedir.texi
 
 
+@ifset gpgone
 @item --pcsc-driver @code{file}
 Use @code{file} to access the smartcard reader. The current default is
 `libpcsclite.so.1' for GLIBC based systems,
 `/System/Library/Frameworks/PCSC.framework/PCSC' for MAC OS X,
 `winscard.dll' for Windows and `libpcsclite.so' for other systems.
+@end ifset
 
+@ifset gpgone
 @item --disable-ccid
 Disable the integrated support for CCID compliant readers. This
 allows to fall back to one of the other drivers even if the internal
 CCID driver can handle the reader. Note, that CCID support is only
 available if libusb was available at build time.
+@end ifset
 
+@ifset gpgone
 @item --reader-port @code{number_or_string}
 This option may be used to specify the port of the card terminal. A
 value of 0 refers to the first serial device; add 32768 to access USB
@@ -1095,6 +1105,7 @@ devices. The default is 32768 (first USB device). PC/SC or CCID
 readers might need a string here; run the program in verbose mode to get
 a list of available readers. The default is then the first reader
 found.
+@end ifset
 
 @item --display-charset @code{name}
 Set the name of the native character set. This is used to convert
@@ -1389,12 +1400,9 @@ For example, when retrieving multiple keys via @option{--recv-keys}, the
 timeout applies separately to each key retrieval, and not to the
 @option{--recv-keys} command as a whole. Defaults to 30 seconds.
 
-@item http-proxy
-For HTTP-like keyserver schemes that (such as HKP and HTTP itself),
-try to access the keyserver over a proxy. If a @code{value} is
-specified, use this as the HTTP proxy. If no @code{value} is
-specified, the value of the environment variable "http_proxy", if any,
-will be used.
+@item http-proxy=@code{value}
+Set the proxy to use for HTTP and HKP keyservers.  This overrides the
+"http_proxy" environment variable, if any.
 
 @item max-cert-size
 When retrieving a key via DNS CERT, only accept keys up to this size.
@@ -1458,9 +1466,15 @@ passphrase. @option{--no-use-agent} disables this option.
 @end ifset
 
 @item --gpg-agent-info
+@ifclear gpgone
+This is dummy option. It has no effect when used with @command{gpg2}.
+@end ifclear
+@ifset gpgone
 Override the value of the environment variable
 @samp{GPG_AGENT_INFO}. This is only used when @option{--use-agent} has
-been given
+been given.  Given that this option is not anymore used by
+@command{gpg2}, it should be avoided if possible.
+@end ifset
 
 @item --lock-once
 Lock the databases the first time a lock is requested
@@ -1971,7 +1985,7 @@ SHA224, SHA384, and SHA512 digests.
 @c ********  ESOTERIC OPTIONS  ***************
 @c *******************************************
 @node GPG Esoteric Options
-@subsection Doing things one usually don't want to do.
+@subsection Doing things one usually doesn't want to do.
 
 @table @gnupgtabopt
 
@@ -2093,8 +2107,8 @@ The same %-expandos used for notation data are available here as well.
 
 @item --sig-keyserver-url @code{string}
 Use @code{string} as a preferred keyserver URL for data signatures. If
-you prefix it with an exclamation mark, the keyserver URL packet will
-be flagged as critical.
+you prefix it with an exclamation mark (!), the keyserver URL packet
+will be flagged as critical.
 
 The same %-expandos used for notation data are available here as well.
 
@@ -2366,11 +2380,13 @@ absolute date in the form YYYY-MM-DD. Defaults to "0".
 @item --allow-secret-key-import
 This is an obsolete option and is not used anywhere.
 
-@item --allow-multisig-verification
-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 and thus it is off by default. Note
-that versions of GPG prior to version 1.4.3 implicitly allowed this.
+@item --allow-multiple-messages
+@item --no-allow-multiple-messages
+Allow processing of multiple OpenPGP messages contained in a single
+file or stream.  Some programs that call GPG are not prepared to deal
+with multiple messages being processed together, so this option
+defaults to no.  Note that versions of GPG prior to 1.4.7 always
+allowed multiple messages.
 
 @item --enable-special-filenames
 This options enables a mode in which filenames of the form
@@ -2448,10 +2464,12 @@ Display the keyring name at the head of key listings to show which
 keyring a given key resides on. This option is deprecated: use
 @option{--list-options [no-]show-keyring} instead.
 
+@ifset gpgone
 @item --ctapi-driver @code{file}
 Use @code{file} to access the smartcard reader. The current default
 is `libtowitoko.so'. Note that the use of this interface is
 deprecated; it may be removed in future releases.
+@end ifset
 
 @item --always-trust
 Identical to @option{--trust-model always}. This option is deprecated.
@@ -2570,6 +2588,16 @@ value. The option @option{--gpg-agent-info} can be used to override it.
 @itemx LINES
 Used to size some displays to the full size of the screen.
 
+
+@item LANGUAGE
+Apart from its use by GNU, it is used in the W32 version to override the
+language selection done through the Registry.  If used and set to a a
+valid and available language name (@var{langid}), the file with the
+translation is loaded from
+@code{@var{gpgdir}/gnupg.nls/@var{langid}.mo}.  Here @var{gpgdir} is the
+directory out of which the gpg binary has been laoded.  If it can't be
+loaded the Registry is tried as a fallback.
+
 @end table
 
 
@@ -2684,6 +2712,13 @@ warning message about insecure memory your operating system supports
 locking without being root. The program drops root privileges as soon
 as locked memory is allocated.
 
+Note also that some systems (especially laptops) have the ability to
+``suspend to disk'' (also known as ``safe sleep'' or ``hibernate'').
+This writes all memory to disk before going into a low power or even
+powered off mode.  Unless measures are taken in the operating system
+to protect the saved memory, passphrases or other sensitive material
+may be recoverable from it later.
+
 @mansect see also
 @ifset isman
 @command{gpgv}(1), 
diff --git a/doc/gpgv.texi b/doc/gpgv.texi
index a09d1d061..5a9f29754 100644
--- a/doc/gpgv.texi
+++ b/doc/gpgv.texi
@@ -157,11 +157,6 @@ The default keyring with the allowed keys
 @end table
 
 @mansect see also
-@ifset gpgone
-@command{gpg}(1)
-@end ifset
-@ifclear gpgone
 @command{gpg2}(1)
-@end ifclear
 @include see-also-note.texi
 
diff --git a/g10/ChangeLog b/g10/ChangeLog
index bf8c92cec..c75dd7181 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,29 @@
+2007-03-01  David Shaw  <[email protected]>
+
+	* options.h, gpg.c (main), mainproc.c (check_sig_and_print): Allow
+	multiple sig verification again as this is protected via the
+	multiple-messages code.
+
+2007-02-26  Werner Koch  <[email protected]>
+
+	* gpg.c (main): Add verify option show-primary-uid-only.
+	* options.h (VERIFY_SHOW_PRIMARY_UID_ONLY): New.
+	* mainproc.c (check_sig_and_print): Implement it.
+
+	* status.h (STATUS_ERROR): New status code.
+	* status.c (get_status_string): Ditto.
+	* mainproc.c (proc_plaintext): Emit it if multiple messages are
+	detected.
+
+2007-02-20  David Shaw  <[email protected]>
+
+	* mainproc.c (literals_seen): New.
+	(proc_plaintext): Error out if more than one plaintext packet is
+	encountered
+	
+	* options.h, gpg.c: New option --allow-multiple-messages and --no
+	variant.
+
 2007-02-13  David Shaw  <[email protected]>
 
 	* parse-packet.c (parse_signature): It's hex.
diff --git a/g10/gpg.c b/g10/gpg.c
index 37d9f11ec..147c17e7b 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -367,6 +367,8 @@ enum cmd_and_opt_values
     oAllowMultisigVerification,
     oEnableDSA2,
     oDisableDSA2,
+    oAllowMultipleMessages,
+    oNoAllowMultipleMessages,
 
     oNoop
   };
@@ -710,6 +712,8 @@ static ARGPARSE_OPTS opts[] = {
     { oAllowMultisigVerification, "allow-multisig-verification", 0, "@"},
     { oEnableDSA2, "enable-dsa2", 0, "@"},
     { oDisableDSA2, "disable-dsa2", 0, "@"},
+    { oAllowMultipleMessages, "allow-multiple-messages", 0, "@"},
+    { oNoAllowMultipleMessages, "no-allow-multiple-messages", 0, "@"},
 
     /* These two are aliases to help users of the PGP command line
        product use gpg with minimal pain.  Many commands are common
@@ -2581,6 +2585,8 @@ main (int argc, char **argv )
 		   N_("show user ID validity during signature verification")},
 		  {"show-unusable-uids",VERIFY_SHOW_UNUSABLE_UIDS,NULL,
 		   N_("show revoked and expired user IDs in signature verification")},
+		  {"show-primary-uid-only",VERIFY_SHOW_PRIMARY_UID_ONLY,NULL,
+		   N_("show only the primary user ID in signature verification")},
 		  {"pka-lookups",VERIFY_PKA_LOOKUPS,NULL,
 		   N_("validate signatures with PKA data")},
 		  {"pka-trust-increase",VERIFY_PKA_TRUST_INCREASE,NULL,
@@ -2774,13 +2780,18 @@ main (int argc, char **argv )
 	    release_akl();
 	    break;
 
-          case oAllowMultisigVerification:
-            opt.allow_multisig_verification = 1;
-            break;
-
 	  case oEnableDSA2: opt.flags.dsa2=1; break;
 	  case oDisableDSA2: opt.flags.dsa2=0; break;
 
+          case oAllowMultisigVerification:
+	  case oAllowMultipleMessages:
+	    opt.flags.allow_multiple_messages=1;
+	    break;
+
+	  case oNoAllowMultipleMessages:
+	    opt.flags.allow_multiple_messages=0;
+	    break;
+
 	  case oNoop: break;
 
 	  default : pargs.err = configfp? 1:2; break;
diff --git a/g10/mainproc.c b/g10/mainproc.c
index cb4432a44..a1913864c 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -84,10 +84,9 @@ struct mainproc_context
 
 
 static int do_proc_packets( CTX c, IOBUF a );
-
 static void list_node( CTX c, KBNODE node );
 static void proc_tree( CTX c, KBNODE node );
-
+static int literals_seen;
 
 static void
 release_list( CTX c )
@@ -619,6 +618,8 @@ proc_plaintext( CTX c, PACKET *pkt )
     int any, clearsig, only_md5, rc;
     KBNODE n;
 
+    literals_seen++;
+
     if( pt->namelen == 8 && !memcmp( pt->name, "_CONSOLE", 8 ) )
 	log_info(_("NOTE: sender requested \"for-your-eyes-only\"\n"));
     else if( opt.verbose )
@@ -702,16 +703,37 @@ proc_plaintext( CTX c, PACKET *pkt )
 	if ( c->mfx.md2  )
 	    md_start_debug( c->mfx.md2, "verify2" );
     }
-    if ( c->pipemode.op == 'B' )
-        rc = handle_plaintext( pt, &c->mfx, 1, 0 );
-    else {
-        rc = handle_plaintext( pt, &c->mfx, c->sigs_only, clearsig );
-        if( rc == G10ERR_CREATE_FILE && !c->sigs_only) {
-            /* can't write output but we hash it anyway to
-             * check the signature */
-            rc = handle_plaintext( pt, &c->mfx, 1, clearsig );
-        }
-    }
+
+    rc=0;
+
+    if(literals_seen>1)
+      {
+	log_info(_("WARNING: multiple plaintexts seen\n"));
+
+	if(!opt.flags.allow_multiple_messages)
+	  {
+            write_status_text (STATUS_ERROR, "proc_pkt.plaintext 89_BAD_DATA");
+	    log_inc_errorcount();
+	    rc=G10ERR_UNEXPECTED;
+	  }
+      }
+
+    if(!rc)
+      {
+	if ( c->pipemode.op == 'B' )
+	  rc = handle_plaintext( pt, &c->mfx, 1, 0 );
+	else
+	  {
+	    rc = handle_plaintext( pt, &c->mfx, c->sigs_only, clearsig );
+	    if( rc == G10ERR_CREATE_FILE && !c->sigs_only)
+	      {
+		/* can't write output but we hash it anyway to
+		 * check the signature */
+		rc = handle_plaintext( pt, &c->mfx, 1, clearsig );
+	      }
+	  }
+      }
+
     if( rc )
 	log_error( "handle plaintext failed: %s\n", g10_errstr(rc));
     free_packet(pkt);
@@ -1478,8 +1500,17 @@ check_sig_and_print( CTX c, KBNODE node )
           n_sig++;
         if (!n_sig)
           goto ambiguous;
-        if (n && !opt.allow_multisig_verification)
-          goto ambiguous;
+
+	/* If we wanted to disallow multiple sig verification, we'd do
+	   something like this:
+
+	   if (n && !opt.allow_multisig_verification)
+               goto ambiguous;
+
+	   However, now that we have --allow-multiple-messages, this
+	   can stay allowable as we can't get here unless multiple
+	   messages (i.e. multiple literals) are allowed. */
+
         if (n_onepass != n_sig)
           {
             log_info ("number of one-pass packets does not match "
@@ -1737,7 +1768,8 @@ check_sig_and_print( CTX c, KBNODE node )
 
         /* If we have a good signature and already printed 
          * the primary user ID, print all the other user IDs */
-        if ( count && !rc ) {
+        if ( count && !rc
+             && !(opt.verify_options&VERIFY_SHOW_PRIMARY_UID_ONLY) ) {
 	    char *p;
             for( un=keyblock; un; un = un->next ) {
                 if( un->pkt->pkttype != PKT_USER_ID )
diff --git a/g10/options.h b/g10/options.h
index 8f866e2ad..c5f0f22d2 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -226,6 +226,7 @@ struct
     unsigned int use_embedded_filename:1;
     unsigned int utf8_filename:1;
     unsigned int dsa2:1;
+    unsigned int allow_multiple_messages:1;
   } flags;
 
   /* Linked list of ways to find a key if the key isn't on the local
@@ -237,8 +238,6 @@ struct
     struct akl *next;
   } *auto_key_locate;
 
-  /* True if multiple concatenated signatures may be verified. */
-  int allow_multisig_verification; 
   int passwd_repeat;
 } opt;
 
@@ -324,6 +323,7 @@ struct {
 #define VERIFY_SHOW_UNUSABLE_UIDS        (1<<6)
 #define VERIFY_PKA_LOOKUPS               (1<<7)
 #define VERIFY_PKA_TRUST_INCREASE        (1<<8)
+#define VERIFY_SHOW_PRIMARY_UID_ONLY     (1<<9)
 
 #define KEYSERVER_USE_TEMP_FILES         (1<<0)
 #define KEYSERVER_KEEP_TEMP_FILES        (1<<1)
diff --git a/g10/status.c b/g10/status.c
index 204482008..627f41f73 100644
--- a/g10/status.c
+++ b/g10/status.c
@@ -166,6 +166,7 @@ get_status_string ( int no )
     case STATUS_PKA_TRUST_BAD  : s = "PKA_TRUST_BAD"; break;
     case STATUS_PKA_TRUST_GOOD : s = "PKA_TRUST_GOOD"; break;
     case STATUS_BEGIN_SIGNING  : s = "BEGIN_SIGNING"; break;
+    case STATUS_ERROR          : s = "ERROR"; break;
     default: s = "?"; break;
     }
   return s;
diff --git a/g10/status.h b/g10/status.h
index bc7271dc9..52f6b2081 100644
--- a/g10/status.h
+++ b/g10/status.h
@@ -120,6 +120,8 @@
 
 #define STATUS_BEGIN_SIGNING    84
 
+#define STATUS_ERROR  85
+
 
 /*-- status.c --*/
 void set_status_fd ( int fd );
diff --git a/po/ChangeLog b/po/ChangeLog
index 7c5e8a235..a5e6ab5a6 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-05  Werner Koch  <[email protected]>
+
+	* LINGUAS: Add nl.
+	* nl.po: Revised translation by Ivar Snaaijer.
+
 2007-02-26  Werner Koch  <[email protected]>
 
 	* sv.po: Update fron Daniel.
diff --git a/po/LINGUAS b/po/LINGUAS
index bd8b5b70e..3f829617f 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -9,6 +9,7 @@ hu
 id it
 ja
 nb
+nl
 pl pt_BR pt
 ro ru 
 sk sv
diff --git a/po/be.po b/po/be.po
index 6fd96c027..52816cbe4 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: [email protected]\n"
-"POT-Creation-Date: 2006-12-04 15:05+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2003-10-30 16:35+0200\n"
 "Last-Translator: Ales Nyakhaychyk <[email protected]>\n"
 "Language-Team: Belarusian <[email protected]>\n"
@@ -41,10 +41,10 @@ msgstr "запіс у stdout\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
+#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -77,9 +77,9 @@ msgstr ""
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
+#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
+#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr ""
@@ -379,14 +379,14 @@ msgstr "сакрэтны ключ недаступны"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
+#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr ""
 
 #: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
+#: g10/keygen.c:1456
 msgid "Your selection? "
 msgstr ""
 
@@ -558,8 +558,8 @@ msgstr ""
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
+#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr ""
 
@@ -582,7 +582,7 @@ msgstr "сакрэтны ключ недаступны"
 msgid "secret key already stored on a card\n"
 msgstr ""
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1319 g10/keyedit.c:1351
 msgid "quit this menu"
 msgstr ""
 
@@ -591,7 +591,7 @@ msgstr ""
 msgid "show admin commands"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1322 g10/keyedit.c:1354
 msgid "show this help"
 msgstr "паказаць гэтую даведку"
 
@@ -647,7 +647,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1457 g10/keyedit.c:1617
 msgid "Command> "
 msgstr "Загад> "
 
@@ -666,7 +666,7 @@ msgstr "несумяшчальныя загады\n"
 msgid "Admin commands are not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1602 g10/keyedit.c:2238
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 
@@ -720,7 +720,7 @@ msgstr "Паўтарыце пароль: "
 msgid "PIN not correctly repeated; try again"
 msgstr ""
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -730,7 +730,7 @@ msgstr "немагчыма адкрыць \"%s\"\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3386 g10/keyserver.c:1705
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -777,7 +777,7 @@ msgstr ""
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:213 g10/sign.c:1286
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr ""
@@ -843,12 +843,12 @@ msgstr ""
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr ""
 
-#: g10/encr-data.c:91 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:292
 #, c-format
 msgid "%s encrypted data\n"
 msgstr ""
 
-#: g10/encr-data.c:93 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:296
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
@@ -983,7 +983,7 @@ msgstr ""
 msgid "WARNING: nothing exported\n"
 msgstr ""
 
-#: g10/gpg.c:378
+#: g10/gpg.c:379
 msgid ""
 "@Commands:\n"
 " "
@@ -991,128 +991,128 @@ msgstr ""
 "@Загады:\n"
 " "
 
-#: g10/gpg.c:380
+#: g10/gpg.c:381
 msgid "|[file]|make a signature"
 msgstr "|[файл]|зрабіць подпіс"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "|[file]|make a clear text signature"
 msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:383
 msgid "make a detached signature"
 msgstr "зрабіць адчэплены подпіс"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "encrypt data"
 msgstr "зашыфраваць даньні"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "encryption only with symmetric cipher"
 msgstr "шыфраваньне толькі сымэтрычнымі шыфрамі"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "decrypt data (default)"
 msgstr "разшыфраваць даньні (дапомна)"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "verify a signature"
 msgstr "праверыць подпіс"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "list keys"
 msgstr "паказаць сьпіс ключоў"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:394
 msgid "list keys and signatures"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "праверыць подпісы ключа"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "list keys and fingerprints"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "list secret keys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "generate a new key pair"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "remove keys from the public keyring"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "remove keys from the secret keyring"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "sign a key"
 msgstr "падпісаць ключ"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "sign a key locally"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:404
 msgid "sign or edit a key"
 msgstr "падпісаць ці рэдагаваць ключ"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "generate a revocation certificate"
 msgstr ""
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "export keys"
 msgstr "экспарт ключоў"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:408
 msgid "export keys to a key server"
 msgstr "экспартаваць ключы на паслужнік ключоў"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:409
 msgid "import keys from a key server"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "search for keys on a key server"
 msgstr ""
 
-#: g10/gpg.c:412
+#: g10/gpg.c:413
 msgid "update all keys from a keyserver"
 msgstr "абнавіць усе ключы з паслужніка ключоў"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:417
 msgid "import/merge keys"
 msgstr "імпартаваць/аб'яднаць ключы"
 
-#: g10/gpg.c:419
+#: g10/gpg.c:420
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:421
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:422
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "update the trust database"
 msgstr ""
 
-#: g10/gpg.c:437
+#: g10/gpg.c:438
 msgid "|algo [files]|print message digests"
 msgstr ""
 
-#: g10/gpg.c:441 g10/gpgv.c:71
+#: g10/gpg.c:442 g10/gpgv.c:70
 msgid ""
 "@\n"
 "Options:\n"
@@ -1122,51 +1122,51 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "create ascii armored output"
 msgstr ""
 
-#: g10/gpg.c:445
+#: g10/gpg.c:446
 msgid "|NAME|encrypt for NAME"
 msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 
-#: g10/gpg.c:457
+#: g10/gpg.c:458
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 
-#: g10/gpg.c:462
+#: g10/gpg.c:463
 msgid "use canonical text mode"
 msgstr ""
 
-#: g10/gpg.c:476
+#: g10/gpg.c:477
 msgid "use as output file"
 msgstr "выкарыстоўваць у якасьці файла вываду"
 
-#: g10/gpg.c:478 g10/gpgv.c:73
+#: g10/gpg.c:479 g10/gpgv.c:72
 msgid "verbose"
 msgstr "шматслоўнасьць"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "do not make any changes"
 msgstr "не рабіць ніякіх зьменаў"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:491
 msgid "prompt before overwriting"
 msgstr "пытацца перад перазапісам"
 
-#: g10/gpg.c:531
+#: g10/gpg.c:532
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:532
+#: g10/gpg.c:533
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1174,7 +1174,7 @@ msgstr ""
 "@\n"
 "(Глядзіце man старонку, для больш поўнага апісаньня ўсіх загадаў і выбараў)\n"
 
-#: g10/gpg.c:564
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1194,15 +1194,15 @@ msgstr ""
 " --list-keys [назвы]        паказаць ключы\n"
 " --fingerprint [назвы]      паказаць адбіткі пальцаў\n"
 
-#: g10/gpg.c:763 g10/gpgv.c:98
+#: g10/gpg.c:766 g10/gpgv.c:97
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Калі ласка, паведамляйце пра памылкі на <[email protected]>.\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:783
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1212,7 +1212,7 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: g10/gpg.c:794
+#: g10/gpg.c:797
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1220,566 +1220,571 @@ msgstr ""
 "\n"
 "Альгарытмы, якія падтрымліваюцца:\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:803 g10/keyedit.c:2310
+#: g10/gpg.c:806 g10/keyedit.c:2304
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:809
+#: g10/gpg.c:812
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:815 g10/keyedit.c:2356
+#: g10/gpg.c:818 g10/keyedit.c:2350
 msgid "Compression: "
 msgstr ""
 
-#: g10/gpg.c:898
+#: g10/gpg.c:901
 msgid "usage: gpg [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: g10/gpg.c:1046
+#: g10/gpg.c:1049
 msgid "conflicting commands\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1067
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1276
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1288
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1300
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1444
+#: g10/gpg.c:1447
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show the keyring name in key listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1954
+#: g10/gpg.c:1957
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 
-#: g10/gpg.c:1996
+#: g10/gpg.c:1999
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:2000
+#: g10/gpg.c:2003
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: g10/gpg.c:2007
+#: g10/gpg.c:2010
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/gpg.c:2236
+#: g10/gpg.c:2239
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2402 g10/gpg.c:2414
+#: g10/gpg.c:2405 g10/gpg.c:2417
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2494
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "%s - гэта недапушчальнае мноства знакаў\n"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2768
+#: g10/gpg.c:2773
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2771
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не дазваляецца разам з %s!\n"
 
-#: g10/gpg.c:2858
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2875
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr ""
 
-#: g10/gpg.c:2880
+#: g10/gpg.c:2890
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "запіс у stdout\n"
 
-#: g10/gpg.c:2894
+#: g10/gpg.c:2904
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2900
+#: g10/gpg.c:2910
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2916
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2919
+#: g10/gpg.c:2929
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:2986 g10/gpg.c:3010
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:2992 g10/gpg.c:3016
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:2998
+#: g10/gpg.c:3008
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3004
+#: g10/gpg.c:3014
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3029
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3031
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3033
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3035
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3037
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3040
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3044
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3051
 msgid "invalid default preferences\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3060
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3064
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3058
+#: g10/gpg.c:3068
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3091
+#: g10/gpg.c:3101
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3148
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3153
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3158
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3271
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [назва_файла]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [назва_файла]"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3291
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [назва_файла]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3314
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3306
+#: g10/gpg.c:3316
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3319
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [назва_файла]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3365
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3367
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3370
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [назва_файла]"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [назва_файла]"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [назва_файла]"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3426
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [загады]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr ""
 
-#: g10/gpg.c:3560
+#: g10/gpg.c:3570
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3572
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3564
+#: g10/gpg.c:3574
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3585
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3595
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3644
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/gpg.c:3854
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[назва_файла]"
 
-#: g10/gpg.c:3858
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4172
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4174
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4207
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
 
@@ -1802,44 +1807,44 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2380 g10/keyedit.c:3712
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 
-#: g10/getkey.c:2611
+#: g10/getkey.c:2614
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/getkey.c:2658
+#: g10/getkey.c:2661
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:73
 msgid "be somewhat more quiet"
 msgstr "працаваць менш шматслоўна"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:76
 msgid "make timestamp conflicts only a warning"
 msgstr ""
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:77
 msgid "|FD|write status info to this FD"
 msgstr ""
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:101
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:104
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2269,7 +2274,7 @@ msgstr ""
 msgid "no writable keyring found: %s\n"
 msgstr ""
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
 #, c-format
 msgid "writing to `%s'\n"
 msgstr ""
@@ -2615,223 +2620,223 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr ""
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
+#: g10/keyedit.c:890 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
+#: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr ""
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr ""
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr ""
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Перазапісаць (y/N)?"
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Гэты ключ згубіў састарэў!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:883
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:885
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:910
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:927
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:951
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr ""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:958
 msgid "This will be a self-signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:964
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:972
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:982
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:989
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:996
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1001
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1006
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1016
 msgid "Really sign? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
-#: g10/keyedit.c:5004 g10/sign.c:352
+#: g10/keyedit.c:1061 g10/keyedit.c:4793 g10/keyedit.c:4884 g10/keyedit.c:4948
+#: g10/keyedit.c:5009 g10/sign.c:351
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1126
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1137 g10/keygen.c:3215
 msgid "This key is not protected.\n"
 msgstr ""
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1145 g10/keygen.c:3218
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1149 g10/keygen.c:3222
 msgid "Key is protected.\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1173
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1179
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2839,204 +2844,204 @@ msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1188 g10/keygen.c:1895
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1193
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1196
 msgid "Do you really want to do this? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1267
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1353
 msgid "save and quit"
 msgstr ""
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1356
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1357
 msgid "list key and user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1359
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1360
 msgid "select subkey N"
 msgstr ""
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1361
 #, fuzzy
 msgid "check signatures"
 msgstr "праверыць подпісы ключа"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1366
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a trust signature"
 msgstr ""
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1379
 msgid "add a user ID"
 msgstr ""
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1381
 msgid "add a photo ID"
 msgstr ""
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1383
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1388
 #, fuzzy
 msgid "add a subkey"
 msgstr "дрэнны ключ"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1392
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1394
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1396
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1402
 msgid "add a revocation key"
 msgstr ""
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1404
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1406
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1408
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1410
 msgid "toggle between the secret and public key listings"
 msgstr ""
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1413
 msgid "list preferences (expert)"
 msgstr ""
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1415
 msgid "list preferences (verbose)"
 msgstr ""
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1417
 msgid "set preference list for the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1422
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr ""
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1432
 msgid "revoke signatures on the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1439
 msgid "revoke key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "падпісаць ключ"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "паказаць сьпіс ключоў"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1442
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1446
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1564
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1582
 msgid "Secret key is available.\n"
 msgstr "Даступны сакрэтны ключ.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1663
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1671
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1690
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3044,160 +3049,160 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1730
 msgid "Key is revoked."
 msgstr ""
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1749
 msgid "Really sign all user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1765
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1788
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1812
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1814
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1815
 msgid "Really remove this user ID? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1865
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1877
 msgid "You must select exactly one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1905
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1960
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1963
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1964
 msgid "Do you really want to delete this key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:1999
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2000
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2018
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2029
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2081
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2123
 msgid "Set preference list to:\n"
 msgstr ""
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2129
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2131
 msgid "Really update the preferences? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2199
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Захаваць зьмены? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2202
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Выйсьці не захаваўшы зьмены? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2212
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2226
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2327
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2379
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2390
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2405 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2413 g10/keyedit.c:2414
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3205,528 +3210,528 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2624
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2683
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2704
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2710
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keyedit.c:2726 g10/keyedit.c:2782 g10/keyedit.c:2843 g10/keyedit.c:2858
 #: g10/keylist.c:194 g10/keyserver.c:511
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2729 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2731 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2733 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2735
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2750
 #, c-format
 msgid "trust: %s"
 msgstr ""
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2754
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2761
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2789 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2813
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr ""
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr ""
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2944
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3005
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3351
+#: g10/keyedit.c:3010 g10/keyedit.c:3345
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3016
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3156
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3166
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3170
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3176
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3190
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3191
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3194
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3227 g10/trustdb.c:1703
 msgid "invalid"
 msgstr ""
 
-#: g10/keyedit.c:3235
+#: g10/keyedit.c:3229
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyedit.c:3242
+#: g10/keyedit.c:3236
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3237
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3246
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3340
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3351
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3371
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3396
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3417
+#: g10/keyedit.c:3411
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3439
+#: g10/keyedit.c:3433
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3452
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3464
+#: g10/keyedit.c:3458
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3525
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3531
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3530
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3538
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3582
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3598
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3678
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:3679
+#: g10/keyedit.c:3684
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3841
+#: g10/keyedit.c:3846
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
+#: g10/keyedit.c:3885 g10/keyedit.c:3995 g10/keyedit.c:4115 g10/keyedit.c:4256
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:4051
+#: g10/keyedit.c:4056
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4131
+#: g10/keyedit.c:4136
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4132
+#: g10/keyedit.c:4137
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4199
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4348
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Перазапісаць (y/N)?"
 
-#: g10/keyedit.c:4407
+#: g10/keyedit.c:4412
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4470
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4492
+#: g10/keyedit.c:4497
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4627
+#: g10/keyedit.c:4632
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4635 g10/keyedit.c:4699 g10/keyedit.c:4742
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4641
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:4640
+#: g10/keyedit.c:4645
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4644
+#: g10/keyedit.c:4649
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4671
+#: g10/keyedit.c:4676
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4697
+#: g10/keyedit.c:4702
 msgid " (non-revocable)"
 msgstr ""
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4709
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4731
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4746
+#: g10/keyedit.c:4751
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4781
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:4846
+#: g10/keyedit.c:4851
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr ""
 
-#: g10/keyedit.c:4863
+#: g10/keyedit.c:4868
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4927
+#: g10/keyedit.c:4932
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:4989
+#: g10/keyedit.c:4994
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:5084
+#: g10/keyedit.c:5089
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr ""
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:876
 msgid "writing direct signature\n"
 msgstr ""
 
-#: g10/keygen.c:911
+#: g10/keygen.c:915
 msgid "writing self signature\n"
 msgstr ""
 
-#: g10/keygen.c:961
+#: g10/keygen.c:965
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
+#: g10/keygen.c:2776
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1331
 msgid "Sign"
 msgstr ""
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1334
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1337
 #, fuzzy
 msgid "Encrypt"
 msgstr "зашыфраваць даньні"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1340
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1348
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1367
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1371
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1376
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1379
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1382
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1385
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1441
 msgid "Please select what kind of key you want:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1443
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr ""
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1446
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr ""
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1448
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr ""
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr ""
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1453
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr ""
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1522
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr ""
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1532
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1539
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr ""
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1553
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1559
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1564 g10/keygen.c:1569
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1618
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3736,7 +3741,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1629
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3746,48 +3751,48 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Key is valid for? (0) "
 msgstr ""
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1673
 msgid "invalid value\n"
 msgstr ""
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1680
 msgid "Key does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Signature does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1686
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1687
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1693
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1698
 msgid "Is this correct? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1713
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3797,44 +3802,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1726
 msgid "Real name: "
 msgstr ""
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Invalid character in name\n"
 msgstr ""
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name may not start with a digit\n"
 msgstr ""
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1738
 msgid "Name must be at least 5 characters long\n"
 msgstr ""
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1746
 msgid "Email address: "
 msgstr ""
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1752
 msgid "Not a valid email address\n"
 msgstr ""
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1760
 msgid "Comment: "
 msgstr ""
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1766
 msgid "Invalid character in comment\n"
 msgstr ""
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1789
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1795
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3842,7 +3847,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1800
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -3857,34 +3862,34 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1826
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:1846
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1886
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:1896 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1902
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -3892,7 +3897,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:1924
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3900,91 +3905,91 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2722
 msgid "Key generation canceled.\n"
 msgstr ""
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:2921 g10/keygen.c:3068
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:2923 g10/keygen.c:3071
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "запіс у stdout\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:2926 g10/keygen.c:3074
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3057
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3063
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3081
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3088
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3111
 msgid "public and secret key created and signed.\n"
 msgstr ""
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3122
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3197 g10/keygen.c:3326
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3236 g10/keygen.c:3359
 msgid "Really create? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3524
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3571
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3597
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
@@ -4265,209 +4270,213 @@ msgstr "немагчыма адкрыць %s: %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:239
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr ""
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:300
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:381
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:438
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:471
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
 
-#: g10/mainproc.c:476 g10/pkclist.c:219
+#: g10/mainproc.c:475 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:479
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:493
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:507
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:509
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:540 g10/mainproc.c:562
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr ""
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:548
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:581
+#: g10/mainproc.c:580
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:584
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:597
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:603
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:624
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:626
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:711
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr ""
+
+#: g10/mainproc.c:839
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1187
 #, fuzzy
 msgid "no signature found\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1430
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1539
 msgid "can't handle this ambiguous signature data\n"
 msgstr ""
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1550
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1551
 #, c-format
 msgid "               using %s key %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1555
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/mainproc.c:1544
+#: g10/mainproc.c:1575
 #, fuzzy
 msgid "Key available at: "
 msgstr "Даведка адсутнічае"
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1797
 #, c-format
 msgid "                aka \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1895
 #, c-format
 msgid "Signature expired %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1900
 #, c-format
 msgid "Signature expires %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1903
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "невядомая вэрсыя"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:2037
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2013
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -4602,16 +4611,16 @@ msgstr ""
 msgid "directory `%s' created\n"
 msgstr "%s: тэчка створана\n"
 
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:143
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:713
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1159
+#: g10/parse-packet.c:1164
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -5311,12 +5320,12 @@ msgid ""
 "unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:347
+#: g10/sign.c:346
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr ""
 
-#: g10/sign.c:356
+#: g10/sign.c:355
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
@@ -5335,11 +5344,11 @@ msgstr ""
 msgid "signing:"
 msgstr ""
 
-#: g10/sign.c:1100
+#: g10/sign.c:1101
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1278
+#: g10/sign.c:1280
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 7c9adb487..0b315e145 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: [email protected]\n"
-"POT-Creation-Date: 2006-12-04 15:05+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2005-02-04 02:04+0100\n"
 "Last-Translator: Jordi Mallach <[email protected]>\n"
 "Language-Team: Catalan <[email protected]>\n"
@@ -61,10 +61,10 @@ msgstr "s'està escrivint la clau secreta a «%s»\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
+#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -98,9 +98,9 @@ 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:481 g10/gpg.c:1008 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
+#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
+#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
@@ -420,15 +420,15 @@ msgstr ""
 
 # Destès? ivb
 # Desatès, sí. jm
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
+#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "no es pot fet això en mode desatès\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
+#: g10/keygen.c:1456
 msgid "Your selection? "
 msgstr "La vostra selecció? "
 
@@ -605,8 +605,8 @@ msgstr "   (%d) RSA (només xifrar)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
+#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "La selecció és invàlida.\n"
 
@@ -630,7 +630,7 @@ msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 msgid "secret key already stored on a card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1319 g10/keyedit.c:1351
 msgid "quit this menu"
 msgstr "ix del menú"
 
@@ -641,7 +641,7 @@ msgstr "les ordres entren en conflicte\n"
 
 # «pantalla» o «ajuda»?  ivb
 # «ajuda», evidentment. jm
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1322 g10/keyedit.c:1354
 msgid "show this help"
 msgstr "mostra aquesta ajuda"
 
@@ -698,7 +698,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1457 g10/keyedit.c:1617
 msgid "Command> "
 msgstr "Ordre> "
 
@@ -715,7 +715,7 @@ msgstr ""
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1602 g10/keyedit.c:2238
 msgid "Invalid command  (try \"help\")\n"
 msgstr "L'ordre no és vàlida (proveu «help»)\n"
 
@@ -773,7 +773,7 @@ msgstr "Repetiu la contrasenya: "
 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:3868 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -783,7 +783,7 @@ 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:3392 g10/keyserver.c:1705
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3386 g10/keyserver.c:1705
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -834,7 +834,7 @@ msgstr "hi ha una clau secreta per a la clau pública «%s»!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utilitzeu l'opció «--delete-secret-keys» per a eliminar-la primer.\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:213 g10/sign.c:1286
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
@@ -907,12 +907,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:91 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:292
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dades xifrades amb %s\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:296
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "xifrat amb l'algoritme %d (desconegut)\n"
@@ -1062,7 +1062,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:378
+#: g10/gpg.c:379
 msgid ""
 "@Commands:\n"
 " "
@@ -1070,130 +1070,130 @@ msgstr ""
 "@Ordres:\n"
 " "
 
-#: g10/gpg.c:380
+#: g10/gpg.c:381
 msgid "|[file]|make a signature"
 msgstr "|[fitxer]|crea una signatura"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "|[file]|make a clear text signature"
 msgstr "|[fitxer]|crea una signatura en text clar"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:383
 msgid "make a detached signature"
 msgstr "crea una signatura separada"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "encrypt data"
 msgstr "xifra dades"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "encryption only with symmetric cipher"
 msgstr "xifra només amb xifratge simètric"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "decrypt data (default)"
 msgstr "desxifra dades (predeterminat)"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "verify a signature"
 msgstr "verifica una signatura"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "list keys"
 msgstr "llista claus"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:394
 msgid "list keys and signatures"
 msgstr "llista claus i signatures"
 
 # «de les claus» o «de la clau»?  ivb
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "comprova les signatures de la claus"
 
 # «dactilars» o «digitals»?  ivb
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "list keys and fingerprints"
 msgstr "llista claus i empremtes digitals"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "list secret keys"
 msgstr "llista claus secretes"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "generate a new key pair"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "remove keys from the public keyring"
 msgstr "elimina claus de l'anell públic"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "remove keys from the secret keyring"
 msgstr "elimina claus de l'anell secret"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "sign a key"
 msgstr "signa una clau"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "sign a key locally"
 msgstr "signa una clau localment"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:404
 msgid "sign or edit a key"
 msgstr "signa o edita una clau"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "generate a revocation certificate"
 msgstr "genera un certificat de revocació"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "export keys"
 msgstr "exporta claus"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:408
 msgid "export keys to a key server"
 msgstr "exporta claus a un servidor de claus"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:409
 msgid "import keys from a key server"
 msgstr "importa claus d'un servidor de claus"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "search for keys on a key server"
 msgstr "cerca claus en un servidor de claus"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:413
 msgid "update all keys from a keyserver"
 msgstr "actualitza totes les claus des d'un servidor de claus"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:417
 msgid "import/merge keys"
 msgstr "importa/fon claus"
 
-#: g10/gpg.c:419
+#: g10/gpg.c:420
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:421
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:422
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "update the trust database"
 msgstr "actualitza la base de dades de confiança"
 
-#: g10/gpg.c:437
+#: g10/gpg.c:438
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fitxers]|imprimeix resums de missatges"
 
-#: g10/gpg.c:441 g10/gpgv.c:71
+#: g10/gpg.c:442 g10/gpgv.c:70
 msgid ""
 "@\n"
 "Options:\n"
@@ -1203,52 +1203,52 @@ msgstr ""
 "Opcions:\n"
 " "
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "create ascii armored output"
 msgstr "crea eixida amb armadura ascii"
 
-#: g10/gpg.c:445
+#: g10/gpg.c:446
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|xifra per a NOM"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "use this user-id to sign or decrypt"
 msgstr "usa aquest id per a signar o desxifrar"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:458
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivell de compressió N (0 no comprimeix)"
 
-#: g10/gpg.c:462
+#: g10/gpg.c:463
 msgid "use canonical text mode"
 msgstr "usa el mode de text canònic"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:477
 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:478 g10/gpgv.c:73
+#: g10/gpg.c:479 g10/gpgv.c:72
 msgid "verbose"
 msgstr "detall"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "do not make any changes"
 msgstr "no fa cap canvi"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:491
 msgid "prompt before overwriting"
 msgstr "pregunta abans de sobreescriure"
 
-#: g10/gpg.c:531
+#: g10/gpg.c:532
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:532
+#: g10/gpg.c:533
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1259,7 +1259,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:564
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1279,15 +1279,15 @@ msgstr ""
 " --list-keys [noms]         mostra claus\n"
 " --fingerprint [noms]       mostra empremtes digitals\n"
 
-#: g10/gpg.c:763 g10/gpgv.c:98
+#: g10/gpg.c:766 g10/gpgv.c:97
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Si us plau, informeu sobre els errors a <[email protected]>.\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:783
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1302,7 +1302,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:794
+#: g10/gpg.c:797
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1310,586 +1310,591 @@ msgstr ""
 "\n"
 "Algoritmes suportats:\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid "Pubkey: "
 msgstr "Clau pública: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2310
+#: g10/gpg.c:806 g10/keyedit.c:2304
 msgid "Cipher: "
 msgstr "Xifratge: "
 
-#: g10/gpg.c:809
+#: g10/gpg.c:812
 msgid "Hash: "
 msgstr "Dispersió: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2356
+#: g10/gpg.c:818 g10/keyedit.c:2350
 msgid "Compression: "
 msgstr "Compressió: "
 
-#: g10/gpg.c:898
+#: g10/gpg.c:901
 msgid "usage: gpg [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: g10/gpg.c:1046
+#: g10/gpg.c:1049
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1067
 #, 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:1261
+#: g10/gpg.c:1264
 #, 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:1264
+#: g10/gpg.c:1267
 #, 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:1267
+#: g10/gpg.c:1270
 #, 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:1273
+#: g10/gpg.c:1276
 #, 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:1276
+#: g10/gpg.c:1279
 #, 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:1279
+#: g10/gpg.c:1282
 #, 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:1285
+#: g10/gpg.c:1288
 #, 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:1288
+#: g10/gpg.c:1291
 #, 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:1291
+#: g10/gpg.c:1294
 #, 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:1297
+#: g10/gpg.c:1300
 #, 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:1300
+#: g10/gpg.c:1303
 #, 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:1303
+#: g10/gpg.c:1306
 #, 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:1444
+#: g10/gpg.c:1447
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 #, 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:1551
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra en quin anell de claus està una clau llistada"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1954
+#: g10/gpg.c:1957
 #, 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:1996
+#: g10/gpg.c:1999
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existeix el fitxer d'opcions predeterminades «%s»\n"
 
-#: g10/gpg.c:2000
+#: g10/gpg.c:2003
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: g10/gpg.c:2007
+#: g10/gpg.c:2010
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s no és per a ús normal!\n"
 
-#: g10/gpg.c:2236
+#: g10/gpg.c:2239
 #, 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:2402 g10/gpg.c:2414
+#: g10/gpg.c:2405 g10/gpg.c:2417
 #, 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:2491
+#: g10/gpg.c:2494
 #, 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:2515 g10/gpg.c:2702 g10/keyedit.c:4069
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 #, 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:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, 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:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "%s no és un joc de caràcters vàlid\n"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2610
 #, 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:2768
+#: g10/gpg.c:2773
 #, 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:2771
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2852
 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:2846
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVÍS: %s té preferència sobre %s\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: g10/gpg.c:2858
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no té sentit amb %s!\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2875
 #, 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:2880
+#: g10/gpg.c:2890
 #, 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:2894
+#: g10/gpg.c:2904
 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:2900
+#: g10/gpg.c:2910
 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:2906
+#: g10/gpg.c:2916
 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:2919
+#: g10/gpg.c:2929
 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:2986 g10/gpg.c:3010
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:2992 g10/gpg.c:3016
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
-#: g10/gpg.c:2998
+#: g10/gpg.c:3008
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3004
+#: g10/gpg.c:3014
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3029
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3031
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3033
 #, 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:3025
+#: g10/gpg.c:3035
 #, 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:3027
+#: g10/gpg.c:3037
 #, 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:3030
+#: g10/gpg.c:3040
 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:3034
+#: g10/gpg.c:3044
 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:3041
+#: g10/gpg.c:3051
 msgid "invalid default preferences\n"
 msgstr "les preferències per defecte són invàlides\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3060
 msgid "invalid personal cipher preferences\n"
 msgstr "les preferències personals de xifrat són invàlides\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3064
 msgid "invalid personal digest preferences\n"
 msgstr "les preferències personals de digest són invàlides\n"
 
-#: g10/gpg.c:3058
+#: g10/gpg.c:3068
 msgid "invalid personal compress preferences\n"
 msgstr "les preferències personals de compressió són invàlides\n"
 
-#: g10/gpg.c:3091
+#: g10/gpg.c:3101
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3148
 #, 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:3143
+#: g10/gpg.c:3153
 #, 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:3148
+#: g10/gpg.c:3158
 #, 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:3250
+#: g10/gpg.c:3260
 #, 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:3261
+#: g10/gpg.c:3271
 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:3272
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3291
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3314
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3306
+#: g10/gpg.c:3316
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3319
 #, 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:3327
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3365
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3367
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3370
 #, 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:3380
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3426
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ordres]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [anell]"
 
-#: g10/gpg.c:3560
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3572
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3564
+#: g10/gpg.c:3574
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3585
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3595
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/gpg.c:3644
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/gpg.c:3854
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
-#: g10/gpg.c:3858
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4172
 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:4164
+#: g10/gpg.c:4174
 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:4197
+#: g10/gpg.c:4207
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
@@ -1916,44 +1921,44 @@ 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:2380 g10/keyedit.c:3712
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, 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:2611
+#: g10/getkey.c:2614
 #, 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:2658
+#: g10/getkey.c:2661
 #, 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"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:73
 msgid "be somewhat more quiet"
 msgstr "una mica més silenciós"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "take the keys from this keyring"
 msgstr "pren les claus d'aquest anell"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:76
 msgid "make timestamp conflicts only a warning"
 msgstr "fes els conflictes de marques de temps només un avís"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:77
 msgid "|FD|write status info to this FD"
 msgstr "|FD|escriu informació d'estat en aquest FD"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:101
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpgv [opcions] [fitxers] (-h per a veure l'ajuda)"
 
 # Werner FIXME: should it use «Usage»?
-#: g10/gpgv.c:105
+#: g10/gpgv.c:104
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2490,7 +2495,7 @@ msgstr "clau %08lX: clau nova - es descarta \n"
 msgid "no writable keyring found: %s\n"
 msgstr "no s'ha trobat cap anell escrivible: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "s'està escrivint en «%s»\n"
@@ -2860,44 +2865,44 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
+#: g10/keyedit.c:890 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Segur que encara voleu signarla? (s/N) "
 
 # O no s'ha pogut? ivb
 # FIXME: comprovar context. jm
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
+#: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  No es pot signar.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "L'ID d'usuari «%s» ha caducat."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "L'ID d'usuari «%s» no està autosignat."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "L'ID d'usuari «%s» no està autosignat."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2906,11 +2911,11 @@ msgstr ""
 "La vostra signatura en «%s»\n"
 "és una signatura d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Voleu ascendir-la a una autosignatura OpenPGP? (s/N) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2919,11 +2924,11 @@ msgstr ""
 "La vostra signatura actual en «%s»\n"
 "ha caducat.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Voleu crear una nova signatura per a reemplaçar la caducada? (s/N) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2932,54 +2937,54 @@ msgstr ""
 "La vostra signatura en «%s»\n"
 "és una signatura local.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Voleu ascendir-la a una signatura completament exportable? (s/N) "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "«%s» ja estava signada localment amb la clau %08lX\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "«%s» ja estava signada amb la clau %08lX\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voleu signarla un altre cop, de tota manera? (s/N) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "No hi ha res que signar amb la clau %08lX\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "La clau ha caducat!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Aquesta clau caducarà el %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Voleu que la vostra signatura caduque alhora? (S/n) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:883
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "No podeu fer una signatura OpenPGP en una clau PGP 2.x en el mode --pgp2.\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:885
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Açò inutilitzaria la clau en PGP 2.x.\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:910
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2989,32 +2994,32 @@ msgstr ""
 "pertany realment a la persona esmentada anteriorment? Si no sabeu què \n"
 "contestar, entreu «0».\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) No vaig a contestar.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) No ho he comprovat en absolut.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) He fet algunes comprovacions.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) He fet comprovacions molt acurades.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:927
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Seleccioneu una opció (introduïu «?» per obtindre més informació):"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:951
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3023,100 +3028,100 @@ msgstr ""
 "Esteu segur que voleu signar aquesta clau\n"
 "amb la vostra clau: \""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:958
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Açò serà una autosignatura.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "AVÍS: la signatura no es marcarà com a inexportable.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:972
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "AVÍS: la signatura no es marcarà com a irrevocable.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:982
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La signatura es marcarà com a inexportable.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:989
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La signatura es marcarà com a irrevocable.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "No he comprovat aquesta clau en absolut.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1001
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "He fet algunes comprovacions a aquesta clau.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1006
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "He comprovat aquesta clau amb molta cura.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1016
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
-#: g10/keyedit.c:5004 g10/sign.c:352
+#: g10/keyedit.c:1061 g10/keyedit.c:4793 g10/keyedit.c:4884 g10/keyedit.c:4948
+#: g10/keyedit.c:5009 g10/sign.c:351
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1126
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1137 g10/keygen.c:3215
 msgid "This key is not protected.\n"
 msgstr "Aquesta clau no està protegida.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1145 g10/keygen.c:3218
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1149 g10/keygen.c:3222
 msgid "Key is protected.\n"
 msgstr "La clau està protegida.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1173
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No es pot editar aquesta clau: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1179
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3124,11 +3129,11 @@ msgstr ""
 "Introduïu la nova contrasenya per a la clau secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1188 g10/keygen.c:1895
 msgid "passphrase not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1193
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3137,65 +3142,65 @@ msgstr ""
 "\n"
 
 # No abusis dels pronoms!  (Rowan Atkinson @ Llei i Desordre)  ivb
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1196
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Esteu segur de voler fer açò? "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1267
 msgid "moving a key signature to the correct place\n"
 msgstr "s'està posant la signatura al lloc correcte\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1353
 msgid "save and quit"
 msgstr "desa i ix"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1356
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra empremta"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1357
 msgid "list key and user IDs"
 msgstr "llista claus i ID"
 
 # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents...  ivb
 # Yeah, els vaig corregir abans de que enviares la teua correcció. jm
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1359
 msgid "select user ID N"
 msgstr "tria l'ID d'usuari N"
 
 # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents...  ivb
 # Yeah, els vaig corregir abans de que enviares la teua correcció. jm
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1360
 #, fuzzy
 msgid "select subkey N"
 msgstr "tria l'ID d'usuari N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1361
 #, fuzzy
 msgid "check signatures"
 msgstr "revoca signatures"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1366
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "signa la clau localment"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1379
 msgid "add a user ID"
 msgstr "afegeix un ID d'usuari"
 
@@ -3203,153 +3208,153 @@ msgstr "afegeix un ID d'usuari"
 # Si et refereixes a Photo vs. photo, ho deixe en minúscules, que en tot
 # el menú està tot en minúscules. Tb hi ha molts ID vs. id en els msgids
 # i no hem unificat en català. Potser li ho diré a Werner. jm.
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1381
 msgid "add a photo ID"
 msgstr "afegeix un photo ID"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1383
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "esborra un ID d'usuari"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1388
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1392
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1394
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1396
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "esborra una clau secundària"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1402
 msgid "add a revocation key"
 msgstr "afegeix una clau de revocació"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marca l'ID d'usuari com a primari"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "canvia entre el llistat de claus secretes i públiques"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1413
 msgid "list preferences (expert)"
 msgstr "llista les preferències (expert)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1415
 msgid "list preferences (verbose)"
 msgstr "llista les preferències (detallat)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "canvia la contrasenya"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "canvia la confiança"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revoca un ID d'usuari"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoca una clau secundària"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "activa una clau"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "desactiva una clau"
 
 # Igual que dalt.  ivb
 # Idem :) jm
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostra el photo ID"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1446
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1564
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "error en llegir el bloc de claus secretes «%s»: %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1582
 msgid "Secret key is available.\n"
 msgstr "La clau secreta està disponible.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1663
 msgid "Need the secret key to do this.\n"
 msgstr "Cal la clau secreta per a fer açò.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1671
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Useu l'ordre «toggle» abans.\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1690
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3357,246 +3362,246 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1730
 msgid "Key is revoked."
 msgstr "La clau està revocada."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1749
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realment voleu signar tots els ID d'usuari? "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1756
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1765
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "la classe de signatura és desconeguda"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1788
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
 msgid "You must select at least one user ID.\n"
 msgstr "Heu de seleccionar al menys un ID d'usuari.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1812
 msgid "You can't delete the last user ID!\n"
 msgstr "No podeu esborrar l'últim ID d'usuari!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1814
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realment voleu eliminar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1815
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1865
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1877
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Heu de seleccionar, si més no, una clau.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1905
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1960
 msgid "You must select at least one key.\n"
 msgstr "Heu de seleccionar, si més no, una clau.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1963
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Realment voleu eliminar les claus seleccionades? "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1964
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Realment voleu eliminar aquesta clau? "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:1999
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2000
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2018
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Realment voleu revocar aquesta clau? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2029
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Realment voleu revocar les claus seleccionades? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Realment voleu revocar aquesta clau? "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2081
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2123
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "estableix la llista de preferències"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realment voleu actualitzar les preferències? "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2199
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Voleu desar els canvis? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2202
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Voleu eixir sense desar? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2212
 #, c-format
 msgid "update failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "ha fallat l'actualització de la clau secreta: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2226
 msgid "Key not changed so no update needed.\n"
 msgstr "La clau no ha canviat, per tant no cal actualització.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2327
 msgid "Digest: "
 msgstr "Resum: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2379
 msgid "Features: "
 msgstr "Funcionalitats: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2390
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2405 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2413 g10/keyedit.c:2414
 #, fuzzy
 msgid "Notations: "
 msgstr "Notació: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2624
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "No hi ha preferències en un ID d'usuari d'estil PGP 2.x.\n"
 
 # Potser %s haja d'anar darrere de «clau».  ivb
 # És cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2683
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Aquesta clau pot ser revocada per la clau %s "
 
 # Potser %s haja d'anar darrere de «clau».  ivb
 # És cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2704
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Aquesta clau pot ser revocada per la clau %s "
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2710
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keyedit.c:2726 g10/keyedit.c:2782 g10/keyedit.c:2843 g10/keyedit.c:2858
 #: g10/keylist.c:194 g10/keyserver.c:511
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "no s'ha pogut creat %s: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2729 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2731 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2733 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2735
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2754
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2761
 msgid "This key has been disabled"
 msgstr "Aquesta clau ha estat desactivada"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2789 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2813
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3604,19 +3609,19 @@ 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:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2944
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3626,7 +3631,7 @@ msgstr ""
 "assumida.\n"
 
 # Photo ID com abans.  ivb
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3005
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3635,78 +3640,78 @@ msgstr ""
 "AVÍS: Aquesta és una clau d'estil PGP2. Afegir un photo ID pot fer que "
 "algunes versions de PGP rebutgen aquesta clau.\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3351
+#: g10/keyedit.c:3010 g10/keyedit.c:3345
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Esteu segur que encara voleu afegir-lo? (s/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3016
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "No podeu afegir un photo ID a una clau d'estil PGP2.\n"
 
 # Aquesta i les següents no haurien de portar (s/N/q) i no (y/N/q)?  ivb
 # Hmm. Sí... (s/N/x) jm
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3156
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3166
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura invàlida? (s/N/x)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3170
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3176
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3190
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "S'ha esborrat %d signatura.\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3191
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "S'han esborrat %d signatures.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3194
 msgid "Nothing deleted.\n"
 msgstr "No s'hi ha eliminat res.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3227 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "invàlida"
 
-#: g10/keyedit.c:3235
+#: g10/keyedit.c:3229
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:3242
+#: g10/keyedit.c:3236
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3237
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3246
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3340
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3715,379 +3720,379 @@ msgstr ""
 "AVÍS: Aquesta és una clau d'estil PGP 2.x. Afegir un revocador designat pot\n"
 "fer que algunes versions de PGP rebutjen aquesta clau.\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3351
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "No podeu afegir un revocador designat a una clau d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3371
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduïu l'ID d'usuari del revocador designat: "
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3396
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "no es pot nominar a una clau d'estil PGP 2.x com a revocador designat\n"
 
-#: g10/keyedit.c:3417
+#: g10/keyedit.c:3411
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
 
-#: g10/keyedit.c:3439
+#: g10/keyedit.c:3433
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3452
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
 
-#: g10/keyedit.c:3464
+#: g10/keyedit.c:3458
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
 
-#: g10/keyedit.c:3525
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Per favor, elimineu les seleccions de les claus secretes.\n"
 
-#: g10/keyedit.c:3531
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Per favor, seleccioneu com a molt una clau secundària.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "S'està canviant la data de caducitat per a una clau secundària.\n"
 
-#: g10/keyedit.c:3538
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "S'està canviant la data de caducitat per a una clau primària.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3582
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3598
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3678
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
 
-#: g10/keyedit.c:3679
+#: g10/keyedit.c:3684
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3841
+#: g10/keyedit.c:3846
 msgid "Please select exactly one user ID.\n"
 msgstr "Heu de seleccionar exactament un ID.\n"
 
-#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
+#: g10/keyedit.c:3885 g10/keyedit.c:3995 g10/keyedit.c:4115 g10/keyedit.c:4256
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "es descarta l'autosignatura v3 en l'id d'usuari «%s»\n"
 
-#: g10/keyedit.c:4051
+#: g10/keyedit.c:4056
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4131
+#: g10/keyedit.c:4136
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:4132
+#: g10/keyedit.c:4137
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4199
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notació de signatura: "
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4348
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Voleu sobreescriure? (s/N) "
 
-#: g10/keyedit.c:4407
+#: g10/keyedit.c:4412
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4470
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4492
+#: g10/keyedit.c:4497
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4627
+#: g10/keyedit.c:4632
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID d'usuari: «"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4635 g10/keyedit.c:4699 g10/keyedit.c:4742
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 "»\n"
 "signat amb la vostra clau %08lX el %s\n"
 
-#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 msgid " (non-exportable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4641
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aquesta signatura va caducar el %s.\n"
 
-#: g10/keyedit.c:4640
+#: g10/keyedit.c:4645
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Esteu segur de que encara voleu revocarla? (s/N) "
 
 # (s/N) ivb
 # S! jm
-#: g10/keyedit.c:4644
+#: g10/keyedit.c:4649
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Voleu crear un certificat de revocació per a aquesta signatura? (s/N) "
 
-#: g10/keyedit.c:4671
+#: g10/keyedit.c:4676
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Heu signat els següents ID d'usuari:\n"
 
-#: g10/keyedit.c:4697
+#: g10/keyedit.c:4702
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4709
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocat per %08lX el %s\n"
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4731
 msgid "You are about to revoke these signatures:\n"
 msgstr "Esteu a punt de revocar aquestes signatures:\n"
 
 # (s/N)?  ivb
-#: g10/keyedit.c:4746
+#: g10/keyedit.c:4751
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realment voleu crear els certificats de revocació? (s/N) "
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4781
 msgid "no secret key\n"
 msgstr "ho hi ha clau secreta\n"
 
-#: g10/keyedit.c:4846
+#: g10/keyedit.c:4851
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4863
+#: g10/keyedit.c:4868
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "AVÍS: una signatura d'ID d'usuari està datada %d segons en el futur\n"
 
-#: g10/keyedit.c:4927
+#: g10/keyedit.c:4932
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4989
+#: g10/keyedit.c:4994
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:5084
+#: g10/keyedit.c:5089
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "S'està mostrant el photo ID %s de mida %ld per a la clau 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "la preferència %c%lu és duplicada\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:876
 msgid "writing direct signature\n"
 msgstr "s'està escrivint una signatura directa\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:915
 msgid "writing self signature\n"
 msgstr "s'està escrivint l'autosignatura\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:965
 msgid "writing key binding signature\n"
 msgstr "s'està escrivint la signatura de comprovació de la clau\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
+#: g10/keygen.c:2776
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "la mida de la clau és invàlida; s'hi usaran %u bits\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "la mida de la clau ha estat arrodonida fins a %u bits\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1331
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1334
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1337
 #, fuzzy
 msgid "Encrypt"
 msgstr "xifra dades"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1340
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1348
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1367
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1371
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1376
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1379
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1382
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1385
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1441
 msgid "Please select what kind of key you want:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1443
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (només xifrar)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (només signar)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1453
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1522
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "La parella de claus DSA ha de tenir 1024 bits.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1532
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1539
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Quina grandària voleu? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1553
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1559
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La grandària sol·licitada és %u bits\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1564 g10/keygen.c:1569
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrodonida fins a %u bits\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1618
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4103,7 +4108,7 @@ msgstr ""
 "      <n>m = la clau caduca als n mesos\n"
 "      <n>y = la clau caduca als n anys\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1629
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4119,42 +4124,42 @@ msgstr ""
 "      <n>m = la signatura caduca als n mesos\n"
 "      <n>y = la signatura caduca als n anys\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Key is valid for? (0) "
 msgstr "Indiqueu la validesa de la clau (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Indiqueu la validesa de la signatura (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1673
 msgid "invalid value\n"
 msgstr "el valor no és vàlid\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1680
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1686
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca el %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1687
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Aquesta signatura caduca el %s\n"
 
 # Amb «it» es refereix a les dates?  ivb
 # Això vaig entendre jo. jm
-#: g10/keygen.c:1687
+#: g10/keygen.c:1693
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4162,12 +4167,12 @@ msgstr ""
 "El vostre sistema no pot representar dates posteriors a l'any 2038.\n"
 "Tanmateix, les tractarà bé fins l'any 2106.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1698
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "És correcte? (s/n)"
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1713
 #, fuzzy
 msgid ""
 "\n"
@@ -4184,44 +4189,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1726
 msgid "Real name: "
 msgstr "Nom i cognoms: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Invalid character in name\n"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name may not start with a digit\n"
 msgstr "El nom no pot començar amb un dígit\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1738
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nom ha de tenir, si més no, 5 caràcters\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1746
 msgid "Email address: "
 msgstr "Adreça electrònica: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1752
 msgid "Not a valid email address\n"
 msgstr "No és una adreça vàlida\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1760
 msgid "Comment: "
 msgstr "Comentari: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1766
 msgid "Invalid character in comment\n"
 msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1789
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Esteu usant el joc de caràcters `%s'.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1795
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4232,7 +4237,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1800
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
 
@@ -4249,23 +4254,23 @@ msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoXx"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1826
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Canvia (N)om, (C)omentari, (E)mail o (X) ix "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Canvia (N)om, (C)omentari, (E)mail o (O) d'acord / (X) ix"
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:1846
 msgid "Please correct the error first\n"
 msgstr "Corregiu l'error primer\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1886
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4273,12 +4278,12 @@ msgstr ""
 "Cal una contrasenya per a protegir la clau secreta.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:1896 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1902
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4290,7 +4295,7 @@ msgstr ""
 "useu aquest programa amb l'opció \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:1924
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4302,53 +4307,53 @@ msgstr ""
 "nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
 "d'aconseguir prou entropia.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2722
 msgid "Key generation canceled.\n"
 msgstr "La generació de claus ha estat cancel·lada.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:2921 g10/keygen.c:3068
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "s'està escrivint la clau pública a «%s»\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:2923 g10/keygen.c:3071
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:2926 g10/keygen.c:3074
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
 # Potser no hi haja cap anell! ivb
-#: g10/keygen.c:3041
+#: g10/keygen.c:3057
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "no s'ha trobat cap anell públic escrivible: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3063
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 "no s'ha trobat cap anell secret de escrivible: %s\n"
 "\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3081
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell públic «%s»: %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3088
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3111
 msgid "public and secret key created and signed.\n"
 msgstr "s'han creat i signat les claus pública i secreta.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3122
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4357,13 +4362,13 @@ msgstr ""
 "Noteu que aquesta clau no serveix per a xifrar. Potser vulgueu usar l'ordre\n"
 "\"--edit-key\" per a generar una clau secundària per a tal propòsit.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
 # Werner FIXME: Use ngettext. jm
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4372,7 +4377,7 @@ msgstr ""
 "amb el rellotge)\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4380,26 +4385,26 @@ msgstr ""
 "la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
 "amb el rellotge)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3197 g10/keygen.c:3326
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: crear subclaus per a claus v3 no és conforme amb OpenPGP\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3236 g10/keygen.c:3359
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crear realment? "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3524
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3571
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3597
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
@@ -4688,215 +4693,219 @@ msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 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:240
+#: g10/mainproc.c:239
 #, 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:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "clau de sessió xifrada amb %s\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:300
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "xifrat amb l'algoritme %d (desconegut)\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:381
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "la clau pública és %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:438
 msgid "public key encrypted data: good DEK\n"
 msgstr "dades xifrades amb clau pública: bona clau de xifratge (DEK)\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:471
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:475 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:479
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "xifrat amb una clau %s, ID %08lX\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:493
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "ha fallat el desxifratge amb la clau pública: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:507
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "xifrat amb %lu contrasenyes\n"
 
 # FIXME WK: Use ngettext
-#: g10/mainproc.c:510
+#: g10/mainproc.c:509
 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:541 g10/mainproc.c:563
+#: g10/mainproc.c:540 g10/mainproc.c:562
 #, 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:549
+#: g10/mainproc.c:548
 #, 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:581
+#: g10/mainproc.c:580
 msgid "decryption okay\n"
 msgstr "desxifratge correcte\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:584
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVÍS: el missatge no tenia protecció d'integritat\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:597
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVÍS: el missatge xifrat ha estat manipulat!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:603
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:624
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitent ha sol·licitat \"alt secret\"\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:626
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom del fitxer original='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:711
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr ""
+
+#: g10/mainproc.c:839
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocació autònoma: useu \"gpg --import\" per a aplicar-la\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1187
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1430
 msgid "signature verification suppressed\n"
 msgstr "s'ha eliminat la verificació de signatura\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1539
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "no es poden tractar aquestes signatures múltiples\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1550
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
 # «%.*s» no serà una data?  Caldrà «el» al davant.  ivb
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1555
 #, 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:1544
+#: g10/mainproc.c:1575
 msgid "Key available at: "
 msgstr "La clau és disponible en: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Signatura INCORRECTA de \""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signatura caducada de \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr "[incert]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1797
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1895
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1900
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Aquesta signatura caduca el %s\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1903
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr "binari"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr "mode text"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 msgid "unknown"
 msgstr "desconeguda"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "No s'ha pogut comprovar la signatura: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
 msgstr "no és una signatura separada\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:2037
 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:2013
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signatura autònoma de classe 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatura de l'estil antic (PGP 2.x)\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "s'ha detectat un paquet arrel invàlid en proc_tree()\n"
 
@@ -5040,17 +5049,17 @@ msgstr ""
 msgid "directory `%s' created\n"
 msgstr "%s: s'ha creat el directori\n"
 
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:143
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "no es pot treballar amb l'algoritme de clau pública %d\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:713
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVÍS: la clau de sessió pot estar xifrada simètricament de forma insegura\n"
 
-#: g10/parse-packet.c:1159
+#: g10/parse-packet.c:1164
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquet de tipus %d té el bit crític activat\n"
@@ -5837,12 +5846,12 @@ msgstr ""
 "AVÍS: no s'ha pogut %%-expandir l'url de política (massa gran). S'utilitza "
 "no expandida.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:346
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:355
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatura de: «%s»\n"
@@ -5864,12 +5873,12 @@ msgstr ""
 msgid "signing:"
 msgstr "signatura:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1101
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "només podeu signar en clar amb claus d'estil PGP 2.x en el mode --pgp2\n"
 
-#: g10/sign.c:1278
+#: g10/sign.c:1280
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "s'utilitzarà xifratge %s\n"
diff --git a/po/cs.po b/po/cs.po
index 8947f805e..3a7904cdb 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: [email protected]\n"
-"POT-Creation-Date: 2006-12-04 15:05+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2004-11-26 09:12+0200\n"
 "Last-Translator: Roman Pavlik <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
@@ -41,10 +41,10 @@ msgstr "zapisuji tajn� kl�� do `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
+#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -77,9 +77,9 @@ msgstr "nemohu ��st `%s': %s\n"
 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:481 g10/gpg.c:1008 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
+#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
+#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
@@ -389,14 +389,14 @@ msgstr "OpenPGp karta nen� dostupn�: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Nalezena OpenPGP karta ��slo %s\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
+#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "nelze prov�st v d�vkov�m m�du\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
+#: g10/keygen.c:1456
 msgid "Your selection? "
 msgstr "V� v�b�r? "
 
@@ -562,8 +562,8 @@ msgstr "   (2) �ifrovac� kl��\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiza�n� kl��\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
+#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�b�r.\n"
 
@@ -583,7 +583,7 @@ msgstr "tajn� ��sti kl�e nejsou dostupn�\n"
 msgid "secret key already stored on a card\n"
 msgstr "tajn� kl�� je na kart� ulo�en\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1319 g10/keyedit.c:1351
 msgid "quit this menu"
 msgstr "ukon�it toto menu"
 
@@ -591,7 +591,7 @@ msgstr "ukon�it toto menu"
 msgid "show admin commands"
 msgstr "zobraz administr�torsk� p��kazy"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1322 g10/keyedit.c:1354
 msgid "show this help"
 msgstr "uk�zat tuto pomoc"
 
@@ -643,7 +643,7 @@ msgstr "nab�dka pro zm�nu anebo odblokov�n� PINu"
 msgid "verify the PIN and list all data"
 msgstr "ov�� PIN a vypi� v�echna data"
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1457 g10/keyedit.c:1617
 msgid "Command> "
 msgstr "P��kaz> "
 
@@ -659,7 +659,7 @@ msgstr "administr�torsk� p��kazy jsou povoleny\n"
 msgid "Admin commands are not allowed\n"
 msgstr "administr�torsk� p��kazy nejsou povoleny\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1602 g10/keyedit.c:2238
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
 
@@ -716,7 +716,7 @@ msgstr "Opakujte tento PIN: "
 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:3868 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 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,7 +726,7 @@ msgstr "nelze otev��t `%s'\n"
 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:3392 g10/keyserver.c:1705
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3386 g10/keyserver.c:1705
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -773,7 +773,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "abyste ho smazal(a), pou�ijte nejprve parametr \"--delete-secret-key\".\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:213 g10/sign.c:1286
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
@@ -843,12 +843,12 @@ msgstr "pou�it� %s nen� v m�du %s dovoleno\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s za�ifrovan� pro: %s\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:292
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s za�ifrovan� data\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:296
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "za�ifrov�no nezn�m�m algoritmem %d\n"
@@ -987,7 +987,7 @@ msgstr "VAROV�N�: tajn� kl�� %s nen� chr�n�n pomoc� simple SK checksum\n"
 msgid "WARNING: nothing exported\n"
 msgstr "VAROV�N�: nebylo nic vyexportov�no\n"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:379
 msgid ""
 "@Commands:\n"
 " "
@@ -995,127 +995,127 @@ msgstr ""
 "@P��kazy:\n"
 " "
 
-#: g10/gpg.c:380
+#: g10/gpg.c:381
 msgid "|[file]|make a signature"
 msgstr "|[soubor]|vytvo�it podpis"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "|[file]|make a clear text signature"
 msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:383
 msgid "make a detached signature"
 msgstr "vytvo�it podpis odd�len� od dokumentu"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "encrypt data"
 msgstr "�ifrovat data"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrov�n� pouze se symetrickou �ifrou"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "decrypt data (default)"
 msgstr "de�ifrovat data (implicitn�)"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "verify a signature"
 msgstr "verifikovat podpis"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "list keys"
 msgstr "vypsat seznam kl���"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:394
 msgid "list keys and signatures"
 msgstr "vypsat seznam kl��� a podpis�"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "list and check key signatures"
 msgstr "vypsat a zkontrolovat podpisy kl���"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "list keys and fingerprints"
 msgstr "vypsat seznam kl��� a fingerprint�"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "list secret keys"
 msgstr "vypsat seznam tajn�ch kl���"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "generate a new key pair"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "remove keys from the public keyring"
 msgstr "odstranit kl�� ze souboru ve�ejn�ch kl���"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "remove keys from the secret keyring"
 msgstr "odstranit kl�� ze souboru tajn�ch kl���"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "sign a key"
 msgstr "podepsat kl��"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "sign a key locally"
 msgstr "podepsat kl�� lok�ln�"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:404
 msgid "sign or edit a key"
 msgstr "podepsat nebo modifikovat kl��"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "generate a revocation certificate"
 msgstr "vytvo�it revoka�n� certifik�t"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "export keys"
 msgstr "exportovat kl��e"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:408
 msgid "export keys to a key server"
 msgstr "exportovat kl��e na server kl���"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:409
 msgid "import keys from a key server"
 msgstr "importovat kl��e ze serveru kl���"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "search for keys on a key server"
 msgstr "vyhledat kl��e na serveru kl���"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:413
 msgid "update all keys from a keyserver"
 msgstr "aktualizovat v�echny kl��e ze serveru kl���"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:417
 msgid "import/merge keys"
 msgstr "importovat/slou�it kl��e"
 
-#: g10/gpg.c:419
+#: g10/gpg.c:420
 msgid "print the card status"
 msgstr "vytisknout stav karty"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:421
 msgid "change data on a card"
 msgstr "zm�nit data na kart�"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:422
 msgid "change a card's PIN"
 msgstr "zm�nit PIN karty"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "update the trust database"
 msgstr "aktualizovat datab�zi d�v�ry"
 
-#: g10/gpg.c:437
+#: g10/gpg.c:438
 msgid "|algo [files]|print message digests"
 msgstr "|algo [soubory]  vypi� hash"
 
-#: g10/gpg.c:441 g10/gpgv.c:71
+#: g10/gpg.c:442 g10/gpgv.c:70
 msgid ""
 "@\n"
 "Options:\n"
@@ -1125,55 +1125,55 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "create ascii armored output"
 msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
 
-#: g10/gpg.c:445
+#: g10/gpg.c:446
 msgid "|NAME|encrypt for NAME"
 msgstr "|JM�NO|�ifrovat pro JM�NO"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 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:457
+#: g10/gpg.c:458
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavit �rov�� komprimace N (0 - ��dn�\n"
 " komprimace)"
 
-#: g10/gpg.c:462
+#: g10/gpg.c:463
 msgid "use canonical text mode"
 msgstr "pou��t kanonick� textov� m�d"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:477
 msgid "use as output file"
 msgstr "pou��t jako v�stupn� soubor"
 
-#: g10/gpg.c:478 g10/gpgv.c:73
+#: g10/gpg.c:479 g10/gpgv.c:72
 msgid "verbose"
 msgstr "s dodate�n�mi informacemi"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "do not make any changes"
 msgstr "neprov�d�t ��dn� zm�ny"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:491
 msgid "prompt before overwriting"
 msgstr "vy��dat potvrzen� p�ed p�eps�n�m"
 
-#: g10/gpg.c:531
+#: g10/gpg.c:532
 msgid "use strict OpenPGP behavior"
 msgstr "pou��t chov�n� striktn� podle OpenPGP"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:533
 msgid "generate PGP 2.x compatible messages"
 msgstr "generovat zpr�vu komplatibiln� s PGP 2.x"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1181,7 +1181,7 @@ msgstr ""
 "@\n"
 "(Pou�ijte manu�lov� str�nky pro kompletn� seznam v�ech p��kaz� a mo�nost�)\n"
 
-#: g10/gpg.c:564
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1199,17 +1199,17 @@ msgstr ""
 " --list-keys [jm�na]        vypsat kl��e\n"
 " --fingerprint [jm�na]      vypsat fingerprinty \n"
 
-#: g10/gpg.c:763 g10/gpgv.c:98
+#: g10/gpg.c:766 g10/gpgv.c:97
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Chyby oznamte, pros�m, na adresu <[email protected]>.\n"
 "P�ipom�nky k p�ekladu <[email protected]>.\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:783
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1219,7 +1219,7 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: g10/gpg.c:794
+#: g10/gpg.c:797
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1227,79 +1227,79 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid "Pubkey: "
 msgstr "Ve�ejn� kl��: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2310
+#: g10/gpg.c:806 g10/keyedit.c:2304
 msgid "Cipher: "
 msgstr "�ifra: "
 
-#: g10/gpg.c:809
+#: g10/gpg.c:812
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2356
+#: g10/gpg.c:818 g10/keyedit.c:2350
 msgid "Compression: "
 msgstr "Komprese: "
 
-#: g10/gpg.c:898
+#: g10/gpg.c:901
 msgid "usage: gpg [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: g10/gpg.c:1046
+#: g10/gpg.c:1049
 msgid "conflicting commands\n"
 msgstr "konfliktn� p��kazy\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1067
 #, 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:1261
+#: g10/gpg.c:1264
 #, 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:1264
+#: g10/gpg.c:1267
 #, 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:1267
+#: g10/gpg.c:1270
 #, 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:1273
+#: g10/gpg.c:1276
 #, 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:1276
+#: g10/gpg.c:1279
 #, 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:1279
+#: g10/gpg.c:1282
 #, 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:1285
+#: g10/gpg.c:1288
 #, 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:1288
+#: g10/gpg.c:1291
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1307,21 +1307,21 @@ msgstr ""
 "VAROV�N�: vlastnictv� adres��e s konfigura�n�m souborem nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, 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:1297
+#: g10/gpg.c:1300
 #, 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:1300
+#: g10/gpg.c:1303
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1329,7 +1329,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:1303
+#: g10/gpg.c:1306
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
@@ -1337,484 +1337,489 @@ msgstr ""
 "nastavena bezpe�n� `%s'\n"
 
 # c-format
-#: g10/gpg.c:1444
+#: g10/gpg.c:1447
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 #, 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:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/gpg.c:1954
+#: g10/gpg.c:1957
 #, 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:1996
+#: g10/gpg.c:1999
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� soubor s mo�nostmi `%s'\n"
 
-#: g10/gpg.c:2000
+#: g10/gpg.c:2003
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: g10/gpg.c:2007
+#: g10/gpg.c:2010
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, 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:2236
+#: g10/gpg.c:2239
 #, 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:2402 g10/gpg.c:2414
+#: g10/gpg.c:2405 g10/gpg.c:2417
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2494
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nen� platn� znakov� sada\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru kl���\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 msgid "invalid list options\n"
 msgstr "neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "`%s' nen� platn� doba expirace podpisu\n"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2603
 msgid "invalid verify options\n"
 msgstr "neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/gpg.c:2768
+#: g10/gpg.c:2773
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2771
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROV�N�: program m��e vytvo�it soubor core!\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROV�N�: %s p�ep��e %s\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nen� dovoleno pou��vat %s s %s!\n"
 
-#: g10/gpg.c:2858
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�v� s %s smysl!\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2875
 #, 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:2880
+#: g10/gpg.c:2890
 #, 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:2894
+#: g10/gpg.c:2904
 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:2900
+#: g10/gpg.c:2910
 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:2906
+#: g10/gpg.c:2916
 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:2919
+#: g10/gpg.c:2929
 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:2986 g10/gpg.c:3010
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2992 g10/gpg.c:3016
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2998
+#: g10/gpg.c:3008
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� komprimovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3004
+#: g10/gpg.c:3014
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3029
 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:3021
+#: g10/gpg.c:3031
 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:3023
+#: g10/gpg.c:3033
 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:3025
+#: g10/gpg.c:3035
 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:3027
+#: g10/gpg.c:3037
 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:3030
+#: g10/gpg.c:3040
 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:3034
+#: g10/gpg.c:3044
 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:3041
+#: g10/gpg.c:3051
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� p�edvolby\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3060
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro �ifrov�n�\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3064
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro hashov�n�\n"
 
-#: g10/gpg.c:3058
+#: g10/gpg.c:3068
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro komprimaci\n"
 
-#: g10/gpg.c:3091
+#: g10/gpg.c:3101
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud nen� funk�n� s %s\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3148
 #, 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:3143
+#: g10/gpg.c:3153
 #, 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:3148
+#: g10/gpg.c:3158
 #, 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:3250
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3271
 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:3272
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [jm�no souboru]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3291
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symetrick� �ifrov�n� `%s' se nepovedlo: %s\n"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3314
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3306
+#: g10/gpg.c:3316
 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:3309
+#: g10/gpg.c:3319
 #, 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:3327
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [jm�no souboru]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3365
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3367
 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:3360
+#: g10/gpg.c:3370
 #, 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:3380
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jm�no souboru]"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jm�no souboru]"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key id u�ivatele"
 
-#: g10/gpg.c:3426
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u�ivatele"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u�ivatele [p��kazy]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3528
 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:3560
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odesl�n� na keyserver se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3572
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "z�sk�n� dat z keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3564
+#: g10/gpg.c:3574
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export kl��e se nepoda�il: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3585
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hled�n� na keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3595
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh dat na keyserveru se nezda�il: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dov�n� z ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3644
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3854
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[jm�no souboru]"
 
-#: g10/gpg.c:3858
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�n�te ps�t svou zpr�vu ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4172
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pro certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4174
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4207
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
@@ -1838,42 +1843,42 @@ msgstr ""
 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:2380 g10/keyedit.c:3712
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, 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:2611
+#: g10/getkey.c:2614
 #, 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:2658
+#: g10/getkey.c:2661
 #, 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"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:73
 msgid "be somewhat more quiet"
 msgstr "b�t o trochu v�c tich�"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "take the keys from this keyring"
 msgstr "ber kl��e z t�to kl��enky (keyringu)"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:76
 msgid "make timestamp conflicts only a warning"
 msgstr "pouze varov�n� p�i konfliktu �asov�ho raz�tka"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:77
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapsat informace o stavu do tohoto FD"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:101
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:104
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2412,7 +2417,7 @@ msgid "no writable keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor kl��� (keyring): %s\n"
 
 # g10/import.c:766 g10/openfile.c:261#, c-format
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisuji do '%s'\n"
@@ -2769,41 +2774,41 @@ msgstr ""
 "Pros�m vlo�te dom�nu, pro kterou je podpis omezen nebo stiskn�te enter pro "
 "podpis bez omezen� na dom�nu.\n"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "U�ivatelsk� ID \"%s\" je revokov�no."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
+#: g10/keyedit.c:890 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Jste si jist�(�), �e st�le chcete podepsat tento kl��? (a/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
+#: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  Nelze podepsat.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Vypr�ela platnost u�ivatelsk�ho ID \"%s\"."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID u�ivatele \"%s\" nen� podeps�no j�m sam�m."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID u�ivatele \"%s\" je p�ipraveno k podpisu."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 msgid "Sign it? (y/N) "
 msgstr "Podepsat? (a/N) "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2812,11 +2817,11 @@ msgstr ""
 "Podpis kl��e \"%s\" j�m sam�m je\n"
 "podpis form�tu PGP 2.x.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "P�ejete si jej zm�nit na form�t OpenPGP? (a/N) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2826,13 +2831,13 @@ msgstr ""
 "vypr�ela.\n"
 "\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Chcete vytvo�it nov� podpis a nahradit j�m ten, jeho� platnost vypr�ela? (a/"
 "N) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2842,54 +2847,54 @@ msgstr ""
 "je pouze lok�ln�.\n"
 "\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "P�ejete si jej zm�nit na pln� exportovateln� podpise? (a/N) "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" je ji� lok�ln� podeps�n kl��em %s\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" je ji� podeps�n kl��em %s\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Chcete kl�� p�esto znova podepsat? (a/N) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nic k podeps�n� kl��em %s\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Platnost kl��e vypr�ela!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Platnost kl��e vypr�� %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Chcete, aby platnost Va�eho podpisu vypr�ela ve stejnou dobu? (A/n) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:883
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Nem��ete ud�lat OpenPGP podpis kl��e typu PGP 2.x, kdy� jste v --pgp2 m�du.\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:885
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "To by zp�sobilo nepou�itelnost kl��e v PGP 2.x.\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:910
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2899,31 +2904,31 @@ msgstr ""
 "pat�� v��e uveden� osob�.\n"
 "Pokud nezn�te odpov��, zadejte \"0\".\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Neodpov�m.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Nijak jsem to nekontroloval(a).%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ��ste�n� jsem to ov��il(a).%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Velmi pe�liv� jsem to ov��il(a).%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:927
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Va� v�b�r? (pro v�ce informac� vlo�te '?'): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:951
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2932,76 +2937,76 @@ msgstr ""
 "Jste si jist�(�), �e chcete podepsat tento kl��\n"
 "sv�m kl��em \"%s\" (%s)\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:958
 msgid "This will be a self-signature.\n"
 msgstr "Jedn� se o podpis kl��e j�m sam�m.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:964
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "VAROV�N�: podpis nebude ozna�en jako neexportovateln�.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:972
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "VAROV�N�: podpis nebude ozna�en jako neodvolateln� (non-revocable).\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:982
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Podpis bude ozna�en jako neexportovateln�.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:989
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Podpis bude ozna�en jako neodvolateln� (non-revocable).\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:996
 msgid "I have not checked this key at all.\n"
 msgstr "Nijak jsem tento kl�� neov��il.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1001
 msgid "I have checked this key casually.\n"
 msgstr "��ste�n� jsem ov��il tento kl��.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1006
 msgid "I have checked this key very carefully.\n"
 msgstr "Velmi pe�liv� jsem ov��il tento kl��.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1016
 msgid "Really sign? (y/N) "
 msgstr "Skute�n� podepsat? (a/N) "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
-#: g10/keyedit.c:5004 g10/sign.c:352
+#: g10/keyedit.c:1061 g10/keyedit.c:4793 g10/keyedit.c:4884 g10/keyedit.c:4948
+#: g10/keyedit.c:5009 g10/sign.c:351
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podeps�n� selhalo: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1126
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "K dispozici je jen kontroln� sou�et kl��e nebo je kl�� na kart� - passphrase "
 "nelze zm�nit.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1137 g10/keygen.c:3215
 msgid "This key is not protected.\n"
 msgstr "Tento kl�� nen� chr�n�n�.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� ��sti prim�rn�ho kl��e nejsou dostupn�.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1145 g10/keygen.c:3218
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Tajn� ��st prim�rn�ho kl��e jsou ulo�eny na kart�.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1149 g10/keygen.c:3222
 msgid "Key is protected.\n"
 msgstr "Kl�� je chr�n�n�.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1173
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nen� mo�n� editovat tento kl��: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1179
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3009,11 +3014,11 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pro tento tajn� kl��.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1188 g10/keygen.c:1895
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nen� zopakov�no spr�vn�; zkuste to znovu"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1193
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3021,186 +3026,186 @@ msgstr ""
 "Nechcete heslo - to *nen�* dobr� n�pad!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1196
 msgid "Do you really want to do this? (y/N) "
 msgstr "Opravdu to chcete ud�lat? (a/N) "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1267
 msgid "moving a key signature to the correct place\n"
 msgstr "p�esunuji podpis kl��e na spr�vn� m�sto\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1353
 msgid "save and quit"
 msgstr "ulo�it a ukon�it"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1356
 msgid "show key fingerprint"
 msgstr "vypsat fingerprint kl��e"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1357
 msgid "list key and user IDs"
 msgstr "vypsat seznam kl��� a id u�ivatel�"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1359
 msgid "select user ID N"
 msgstr "vyberte identifik�tor u�ivatele N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1360
 msgid "select subkey N"
 msgstr "vyberte podkl�� N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1361
 msgid "check signatures"
 msgstr "kontrolovat podpisy"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1366
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "podepsat vybran� ID u�ivatele [* n��e jsou uvedeny relevantn� p��kazy]"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs locally"
 msgstr "podepsat vybran� u�ivatelsk� ID lok�ln�"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a trust signature"
 msgstr "podepsat vybran� u�ivatelsk� ID d�v�ryhodn�m podpisem"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "podepsat vybran� u�ivatelsk� ID nerevokovateln�m podpisem"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1379
 msgid "add a user ID"
 msgstr "p�idat identifik�tor u�ivatele"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1381
 msgid "add a photo ID"
 msgstr "p�idat fotografick� ID"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1383
 msgid "delete selected user IDs"
 msgstr "smazat vybran� ID u�ivatele"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1388
 msgid "add a subkey"
 msgstr "p�idat podkl��y"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1392
 msgid "add a key to a smartcard"
 msgstr "p�idat kl�� na kartu"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1394
 msgid "move a key to a smartcard"
 msgstr "p�esunout kl�� na kartu"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1396
 msgid "move a backup key to a smartcard"
 msgstr "p�esunout z�lo�n� kl�� na kartu"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1400
 msgid "delete selected subkeys"
 msgstr "smazat vybran� podkl��e"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1402
 msgid "add a revocation key"
 msgstr "p�idat revoka�n� kl��"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1404
 msgid "delete signatures from the selected user IDs"
 msgstr "smazat podpisy z vybran�ch u�ivatelsk�ch ID"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1406
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "zm�nit datum expirace pro kl�� nebo vybran� podkl��e"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1408
 msgid "flag the selected user ID as primary"
 msgstr "ozna�it vybran� u�ivatelsk� ID jako prim�rn�"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1410
 msgid "toggle between the secret and public key listings"
 msgstr "p�epnout mezi vypisem seznamu tajn�ch a ve�ejn�ch kl���"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1413
 msgid "list preferences (expert)"
 msgstr "vypsat seznam p�edvoleb (pro experty)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1415
 msgid "list preferences (verbose)"
 msgstr "vypsat seznam p�edvoleb (podrobn�)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1417
 msgid "set preference list for the selected user IDs"
 msgstr "nastavit sadu preferenc� pro vybran� u�ivatelsk� ID"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "nastavit URL preferovan�ho server kl��� pro vybran� u�ivatelsk� ID"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "nastavit sadu preferenc� pro vybran� u�ivatelsk� ID"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "zm�nit heslo"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "zm�nit d�v�ryhodnost vlastn�ka kl��e"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1432
 msgid "revoke signatures on the selected user IDs"
 msgstr "revokovat podpisu na vybran�ch u�ivatelsk�ch ID"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1434
 msgid "revoke selected user IDs"
 msgstr "revokovat vybran� u�ivatelsk� ID"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1439
 msgid "revoke key or selected subkeys"
 msgstr "revokovat kl�� nebo vybran� podkl��e"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1440
 msgid "enable key"
 msgstr "nastavit kl�� jako platn� (enable)"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1441
 msgid "disable key"
 msgstr "nastavit kl�� jako neplatn� (disable)"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1442
 msgid "show selected photo IDs"
 msgstr "uk�zat vybran� fotografick� ID"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1446
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1564
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "chyba p�i �ten� bloku tajn�ho kl��e \"%s\": %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1582
 msgid "Secret key is available.\n"
 msgstr "Tajn� kl�� je dostupn�.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1663
 msgid "Need the secret key to do this.\n"
 msgstr "Pro proveden� t�to operace je pot�eba tajn� kl��.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1671
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Pros�m, nejd��ve pou�ijte p��kaz \"toggle\" (p�epnout).\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1690
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3212,156 +3217,156 @@ msgstr ""
 "podpis\n"
 "  (nrsign) nebo libovolnou jejich kombinac�  (ltsign, tnrsign, atd.).\n"
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1730
 msgid "Key is revoked."
 msgstr "Kl�� revokov�n."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1749
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Opravdu podepsat v�echny id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1756
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "N�pov�da: Vyberte id u�ivatele k podeps�n�\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1765
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Nezn�m� typ podpisu `%s'\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1788
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tento p��kaz nen� v m�d� %s dovolen�.\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
 msgid "You must select at least one user ID.\n"
 msgstr "Mus�te vybrat alespo� jeden id u�ivatele.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1812
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem��ete smazat posledn� id u�ivatele!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1814
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Opravdu odstranit v�echny vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1815
 msgid "Really remove this user ID? (y/N) "
 msgstr "Opravdu odstranit tento id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1865
 msgid "Really move the primary key? (y/N) "
 msgstr "Opravdu p�esunout prim�rn� kl��? (a/N) "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1877
 msgid "You must select exactly one key.\n"
 msgstr "Mus�te vybrat pr�v� jeden kl��.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1905
 msgid "Command expects a filename argument\n"
 msgstr "P��kaz o�ek�v� jm�no souboru jako argument\n"
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1919
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Nemohu otev��t `%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1936
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Chyba p�i �ten� z�lo�n�ho kl��e z `%s': %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1960
 msgid "You must select at least one key.\n"
 msgstr "Mus�te vybrat alespo� jeden kl��.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1963
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Opravdu chcete smazat vybran� kl��e? (a/N) "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1964
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Opravdu chcete smazat tento kl��? (a/N) "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:1999
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Opravdu revokovat v�echny vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2000
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Opravdu revokovat tento id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2018
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Opravdu chcete revokovat cel� kl��? (a/N) "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2029
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Opravdu chcete revokovat vybran� podkl��e? (a/N) "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2031
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Opravdu chcete revokovat tento podkl��? (a/N) "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2081
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "D�v�ryhodnost vlastn�ka nelze m�nit je-li pou��v�na datab�ze d�v�ry "
 "poskytnut� u�ivatelem\n"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2123
 msgid "Set preference list to:\n"
 msgstr "Nastavit seznam p�edvoleb:\n"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2129
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Opravdu aktualizovat p�edvolby pro vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2131
 msgid "Really update the preferences? (y/N) "
 msgstr "Opravdu aktualizovat p�edvolby? (a/N) "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2199
 msgid "Save changes? (y/N) "
 msgstr "Ulo�it zm�ny? (a/N) "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2202
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�it bez ulo�en�? (a/N) "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2212
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualizace tajn�ho kl��e selhala: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2226
 msgid "Key not changed so no update needed.\n"
 msgstr "Kl�� nebyl zm�n�n, tak�e nen� pot�eba jej aktualizovat.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2327
 msgid "Digest: "
 msgstr "Hash: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2379
 msgid "Features: "
 msgstr "Vlastnosti: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2390
 msgid "Keyserver no-modify"
 msgstr "Keyserver bez modifikace"
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2405 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Preferovan� keyserver: "
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2413 g10/keyedit.c:2414
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3369,71 +3374,71 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2624
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "U�ivatelsk� ID form�tu PGP 2.x nem� ��dn� p�edvolby\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2683
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "V %s tento kl�� revokoval %s kl��em %s\n"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2704
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tento kl�� m��e b�t revokov�n %s kl��em %s "
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2710
 msgid "(sensitive)"
 msgstr "(citliv� informace)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keyedit.c:2726 g10/keyedit.c:2782 g10/keyedit.c:2843 g10/keyedit.c:2858
 #: g10/keylist.c:194 g10/keyserver.c:511
 #, c-format
 msgid "created: %s"
 msgstr "vytvo�en: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2729 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
 #, c-format
 msgid "revoked: %s"
 msgstr "revokov�n: %s"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2731 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "platnost skon�ila: %s"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2733 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
 #, c-format
 msgid "expires: %s"
 msgstr "platnost skon��: %s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2735
 #, c-format
 msgid "usage: %s"
 msgstr "pou�it�: %s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2750
 #, c-format
 msgid "trust: %s"
 msgstr "d�v�ra: %s"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2754
 #, c-format
 msgid "validity: %s"
 msgstr "platnost: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2761
 msgid "This key has been disabled"
 msgstr "Tento kl�� byl ozna�en za neplatn� (disabled)"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2789 g10/keylist.c:200
 msgid "card-no: "
 msgstr "��slo karty: "
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2813
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3441,17 +3446,17 @@ 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:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "revokov�n"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "platnost skon�ila"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2944
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3459,7 +3464,7 @@ msgstr ""
 "VAROV�N�: ��dn� u�ivatelsk� ID nebylo ozna�eno jako prim�rn�.  Tento p��kaz\n"
 "              m��e zp�sobit, �e za prim�rn� bude pova�ov�no jin� user ID.\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3005
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3468,74 +3473,74 @@ msgstr ""
 "VAROV�N�: Toto je PGP2 kl��. P�id�n� fotografick�ho ID m��e v n�kter�ch\n"
 "         verz�ch PGP v�st k odm�tnut� tohoto kl��e.\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3351
+#: g10/keyedit.c:3010 g10/keyedit.c:3345
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Jste si jist�, �e jej chcete st�le p�idat? (a/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3016
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nem�li by jste p�id�vat fotografick� ID k PGP2 kl��i.\n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3156
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Smazat tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3166
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Smazat tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3170
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Smazat tento nezn�m� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3176
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Opravdu smazat tento podpis podepsan� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3190
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Smaz�n %d podpis.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3191
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Smaz�no %d podpis�.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3194
 msgid "Nothing deleted.\n"
 msgstr "Nic nebylo smaz�no.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3227 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "neplatn�"
 
-#: g10/keyedit.c:3235
+#: g10/keyedit.c:3229
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "U�ivatelsk� ID \"%s\": je ji� odstran�no.\n"
 
-#: g10/keyedit.c:3242
+#: g10/keyedit.c:3236
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3237
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "U�ivatelsk� ID \"%s\": je ji� odstran�no.\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3246
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "U�ivatelsk� ID \"%s\": je ji� odstran�no.\n"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3340
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3544,358 +3549,358 @@ msgstr ""
 "VAROV�N�: Toto je PGP2 kl��. P�id�n� 'pov��en� revokace' m��e v n�kter�ch\n"
 "          verz�ch PGP v�st k odm�tnut� tohoto kl��e.\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3351
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nem�li by jste p�id�vat 'pov��en� revokace' k PGP2 kl��i.\n"
 
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3371
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u�ivatele pov��en�ho revokac�: "
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3396
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "kl�� form�tu PGP 2.x nelze pov��it revokac�\n"
 
-#: g10/keyedit.c:3417
+#: g10/keyedit.c:3411
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "kl�� nelze pov��it revokac� j�m sam�m\n"
 
-#: g10/keyedit.c:3439
+#: g10/keyedit.c:3433
 msgid "this key has already been designated as a revoker\n"
 msgstr "tento kl�� ji� bykl pov��en revokac�\n"
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3452
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "VAROV�N�: ustanoven� kl��e 'pov�en�m revok�torem' je nevratn� operace!\n"
 
-#: g10/keyedit.c:3464
+#: g10/keyedit.c:3458
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Jste si jist�, �e tento kl�� chcete pov��it revokac�? (a/N) "
 
-#: g10/keyedit.c:3525
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Pros�m, odstra�te v�b�r z tajn�ch kl���.\n"
 
-#: g10/keyedit.c:3531
+#: g10/keyedit.c:3526
 msgid "Please select at most one subkey.\n"
 msgstr "Pros�m, vyberte nejv��e jeden podkl��.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3530
 msgid "Changing expiration time for a subkey.\n"
 msgstr "M�n�m dobu expirace podkl��e.\n"
 
-#: g10/keyedit.c:3538
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "M�n�m dobu expirace prim�rn�ho kl��e.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3582
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nem��ete zm�nit dobu platnosti kl��e verze 3\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3598
 msgid "No corresponding signature in secret ring\n"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3678
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROV�N�: podepisovac� podkl�� %s nen� k���ov� certifikov�n\n"
 
-#: g10/keyedit.c:3679
+#: g10/keyedit.c:3684
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3841
+#: g10/keyedit.c:3846
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�v� jeden id u�ivatele .\n"
 
-#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
+#: g10/keyedit.c:3885 g10/keyedit.c:3995 g10/keyedit.c:4115 g10/keyedit.c:4256
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "p�esko�en v3 podpis kl��e j�m sam�m u u�ivatelsk�ho id \"%s\"\n"
 
-#: g10/keyedit.c:4051
+#: g10/keyedit.c:4056
 msgid "Enter your preferred keyserver URL: "
 msgstr "Vlo�te URL preferovan�ho keyserveru: "
 
-#: g10/keyedit.c:4131
+#: g10/keyedit.c:4136
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Jste si jist�(�), �e jej chcete p�epsat? (a/N) "
 
-#: g10/keyedit.c:4132
+#: g10/keyedit.c:4137
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Jste si jist�(�), �e jej chcete smazat? (a/N) "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4199
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Podepisovac� notace: "
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4348
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "P�epsat (a/N)? "
 
-#: g10/keyedit.c:4407
+#: g10/keyedit.c:4412
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u�ivatele s indexem %d\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4470
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje u�ivatelsk� ID s hashem %s\n"
 
-#: g10/keyedit.c:4492
+#: g10/keyedit.c:4497
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje podkl�� s indexem %d\n"
 
-#: g10/keyedit.c:4627
+#: g10/keyedit.c:4632
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u�ivatele:\"%s\"\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4635 g10/keyedit.c:4699 g10/keyedit.c:4742
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "podeps�no va��m kl��em %s v %s%s%s\n"
 
-#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 msgid " (non-exportable)"
 msgstr " (neexportovateln�)"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4641
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:4640
+#: g10/keyedit.c:4645
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Jste si jist�, �e jej chcete st�le revokovat? (a/N) "
 
-#: g10/keyedit.c:4644
+#: g10/keyedit.c:4649
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvo�it pro tento podpis revoka�n� certifik�t? (a/N)"
 
-#: g10/keyedit.c:4671
+#: g10/keyedit.c:4676
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Podepsal(a) jste n�sleduj�c� identifik�tory u�ivatele: %s:\n"
 
-#: g10/keyedit.c:4697
+#: g10/keyedit.c:4702
 msgid " (non-revocable)"
 msgstr " (nerevokovateln�)"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4709
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revokov�no va��m kl��em %s v %s\n"
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4731
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te se revokovat tyto podpisy:\n"
 
-#: g10/keyedit.c:4746
+#: g10/keyedit.c:4751
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvo�it revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4781
 msgid "no secret key\n"
 msgstr "neexistuje tajn� kl��\n"
 
-#: g10/keyedit.c:4846
+#: g10/keyedit.c:4851
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
 
-#: g10/keyedit.c:4863
+#: g10/keyedit.c:4868
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "VAROV�N�: podpis ID u�ivatele je datov�n %d sekund v budoucnosti\n"
 
-#: g10/keyedit.c:4927
+#: g10/keyedit.c:4932
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Kl�� %s je ji� revokov�n.\n"
 
-#: g10/keyedit.c:4989
+#: g10/keyedit.c:4994
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podkl�� %s je ji� revokov�n.\n"
 
-#: g10/keyedit.c:5084
+#: g10/keyedit.c:5089
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Zobrazuji %s fotografick� ID o velikosti %ld pro kl�� %s (uid %d)\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "duplicita p�edvolby `%s'\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 msgid "too many cipher preferences\n"
 msgstr "p��li� mnoho p�edvoleb pro �ifrov�n�\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 msgid "too many digest preferences\n"
 msgstr "p��li� mnoho p�edvoleb pro vzorkov�n�\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 msgid "too many compression preferences\n"
 msgstr "p��li� mnoho p�edvoleb pro komprimaci\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "neplatn� polo�ka `%s' v �et�zci s p�edvolbami\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:876
 msgid "writing direct signature\n"
 msgstr "zapisuji podpis kl��e j�m sam�m (direct signature)\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:915
 msgid "writing self signature\n"
 msgstr "zapisuji podpis kl��e sebou sam�m\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:965
 msgid "writing key binding signature\n"
 msgstr "zapisuji \"key-binding\" podpis\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
+#: g10/keygen.c:2776
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatn� d�lka kl��e; pou�iji %u bit�\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�lka kl��e zaokrouhlena na %u bit�\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1331
 msgid "Sign"
 msgstr "Podepisov�n�"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1334
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1337
 msgid "Encrypt"
 msgstr "�ifrov�n�"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1340
 msgid "Authenticate"
 msgstr "Autentizace"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1348
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1367
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Pro kl�� %s lze prov�st: "
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1371
 msgid "Current allowed actions: "
 msgstr "Aktu�ln� povolen� akce: "
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1376
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost podepisovat\n"
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1379
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost �ifrovat\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1382
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost autentizovat\n"
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1385
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Konec\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1441
 msgid "Please select what kind of key you want:\n"
 msgstr "Pros�m, vyberte druh kl��e, kter� chcete:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1443
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1446
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (nastavit si vlastn� pou�it�)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1448
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (pouze pro �ifrov�n�)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (pouze pro �ifrov�n�)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1453
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nastavit si vlastn� pou�it�)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1522
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "P�r DSA kl��� DSA dlouh� %u bit�.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1532
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "kl�� %s m��e m�t d�lku v intervalu %u a� %u bit�.\n"
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1539
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Jakou d�lku kl��e si p�ejete? (%u) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1553
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "velikost kl��e %s mus� b�t v intervalu %u-%u\n"
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1559
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Po�adovan� d�lka kl��e je %u bit�.\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1564 g10/keygen.c:1569
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokrouhleno na %u bit�\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1618
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3911,7 +3916,7 @@ msgstr ""
 "      <n>m = doba platnosti kl��e skon�� za n m�s�c�\n"
 "      <n>y = doba platnosti kl��e skon�� za n let\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1629
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3927,38 +3932,38 @@ msgstr ""
 "      <n>m = doba platnosti podpisu skon�� za n m�s�c�\n"
 "      <n>y = doba platnosti podpisu skon�� za n let\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Key is valid for? (0) "
 msgstr "Kl�� je platn� pro? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1655
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platn� pro? (%s) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1673
 msgid "invalid value\n"
 msgstr "neplatn� hodnota\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1680
 msgid "Key does not expire at all\n"
 msgstr "Platnost kl��e nikdy neskon��\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Signature does not expire at all\n"
 msgstr "Platnost podpisu nikdy neskon��\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1686
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Platnost kl��e skon�� v %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1687
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnost podpisu skon�� v %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1693
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3966,11 +3971,11 @@ msgstr ""
 "V� syst�m neum� zobrazit data po roce 2038.\n"
 "V ka�d�m p��pad� budou data korektn� zpracov�v�na do roku 2106.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1698
 msgid "Is this correct? (y/N) "
 msgstr "Je to spr�vn� (a/N)? "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1713
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3986,44 +3991,44 @@ msgstr ""
 "    \"Magda Prochazkova (student) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1726
 msgid "Real name: "
 msgstr "Jm�no a p��jmen�: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Invalid character in name\n"
 msgstr "Neplatn� znak ve jm�n�\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name may not start with a digit\n"
 msgstr "Jm�no nem��e za��nat ��slic�\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1738
 msgid "Name must be at least 5 characters long\n"
 msgstr "Jm�no mus� b�t dlouh� alespo� 5 znak�\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1746
 msgid "Email address: "
 msgstr "E-mailov� adresa: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1752
 msgid "Not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1760
 msgid "Comment: "
 msgstr "Koment��: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1766
 msgid "Invalid character in comment\n"
 msgstr "Neplatn� znak v koment��i\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1789
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou��v�te znakovou sadu `%s'.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1795
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4034,7 +4039,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1800
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Do pole jm�no nebo koment�� nepi�te, pros�m, e-mailovou adresu.\n"
 
@@ -4049,25 +4054,25 @@ msgstr "Do pole jm�no nebo koment�� nepi�te, pros�m, e-mailovou adresu.\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 msgid "NnCcEeOoQq"
 msgstr "jJkKeEPpUu"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1826
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Zm�nit (J)m�no, (K)oment��, (E)-mail nebo (U)kon�it? "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Zm�nit (J)m�no, (K)oment��, (E)-mail, (P)okra�ovat d�l nebo (U)kon�it "
 "program? "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:1846
 msgid "Please correct the error first\n"
 msgstr "Nejd��v, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1886
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4075,12 +4080,12 @@ msgstr ""
 "Pro ochranu Va�eho tajn�ho kl��e mus�te zadat heslo.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:1896 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1902
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4092,7 +4097,7 @@ msgstr ""
 "tohoto programu s parametrem \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:1924
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4105,50 +4110,50 @@ msgstr ""
 "pou��vat disky); d�ky tomu m� gener�tor lep�� �anci z�skat dostatek "
 "entropie.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2722
 msgid "Key generation canceled.\n"
 msgstr "Vytv��en� kl��e bylo zru�eno.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:2921 g10/keygen.c:3068
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuji ve�ejn� kl�� do `%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:2923 g10/keygen.c:3071
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:2926 g10/keygen.c:3074
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3057
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor ve�ejn�ch kl��� (pubring): %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3063
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor tajn�ch kl��� (secring): %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3081
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu do souboru ve�ejn�ch kl��� `%s': %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3088
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu do souboru tajn�ch kl��� `%s': %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3111
 msgid "public and secret key created and signed.\n"
 msgstr "ve�ejn� a tajn� kl�� byly vytvo�eny a podeps�ny.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3122
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4156,12 +4161,12 @@ msgstr ""
 "Tento kl�� nem��e b�t pou�it� pro �ifrov�n�. K vytvo�en�\n"
 "sekund�rn�ho kl��e pro tento ��el m��ete pou��t p��kaz \"--edit-key\".\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4169,7 +4174,7 @@ msgstr ""
 "kl�� byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
 "je probl�m se syst�mov�m �asem)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4177,25 +4182,25 @@ msgstr ""
 "kl�� byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
 "je probl�m se syst�mov�m �asem)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3197 g10/keygen.c:3326
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "POZN�MKA: vytvo�en� podkl��e pro kl��e v3 nen� v souladu s OpenPGP\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3236 g10/keygen.c:3359
 msgid "Really create? (y/N) "
 msgstr "Opravdu vytvo�it? (a/N) "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3524
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "ulo�en� kl��e na kartu se nezda�ilo: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3571
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nemohu vytvo�it z�lohu souboru `%s': %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3597
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "POZN�MKA: z�loha kl��e z karty ulo�ena do `%s'\n"
@@ -4472,214 +4477,218 @@ msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:239
 #, 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:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s za�ifrovan� kl�� sezen�\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:300
 #, 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:382
+#: g10/mainproc.c:381
 #, c-format
 msgid "public key is %s\n"
 msgstr "ve�ejn� kl�� je %s\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:438
 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:472
+#: g10/mainproc.c:471
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:475 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:480
+#: g10/mainproc.c:479
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "za�ifrov�no %s kl��em, ID %s\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:493
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "de�ifrov�n� ve�ejn�m kl��em selhalo: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:507
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "za�ifrov�no s heslem %lu\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:509
 msgid "encrypted with 1 passphrase\n"
 msgstr "za�ifrov�no jedn�m heslem\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:540 g10/mainproc.c:562
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "p�edpokl�d�m %s �ifrovan�ch dat\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:548
 #, 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:581
+#: g10/mainproc.c:580
 msgid "decryption okay\n"
 msgstr "de�ifrov�n� o.k.\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:584
 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:598
+#: g10/mainproc.c:597
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROV�N�: se za�ifrovanou zpr�vou bylo manipulov�no!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:603
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "de�ifrov�n� selhalo: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:624
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "POZN�MKA: odes�latel po�adoval (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:626
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "p�vodn� jm�no souboru='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:711
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr ""
+
+#: g10/mainproc.c:839
 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:1165
+#: g10/mainproc.c:1187
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Dobr� podpis od \"%s\""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1430
 msgid "signature verification suppressed\n"
 msgstr "verifikace podpisu potla�ena\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1539
 #, 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:1519
+#: g10/mainproc.c:1550
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Podpis vytvo�en %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1551
 #, 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:1524
+#: g10/mainproc.c:1555
 #, 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:1544
+#: g10/mainproc.c:1575
 msgid "Key available at: "
 msgstr "Kl�� k dispozici na: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "�PATN� podpis od \"%s\""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypr�enou platnost� od \"%s\""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobr� podpis od \"%s\""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr "[nejist�]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1797
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \"%s\""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1895
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnost podpisu skon�ila %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1900
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnost podpisu skon�� %s\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1903
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr "bin�rn� form�t"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr "textov� form�t"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 msgid "unknown"
 msgstr "nezn�m� form�t"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nemohu ov��it podpis: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
 msgstr "toto nen� podpis odd�len� od dokumentu\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:2037
 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:2013
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatn� podpis t��dy 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis star�ho typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nalezen neplatn� ko�enov� paket v proc_tree()\n"
 
@@ -4812,16 +4821,16 @@ msgstr "VAROV�N�: nastaven� z `%s' nejsou p�i tomto spu�t�n� zat�m aktivn�\n"
 msgid "directory `%s' created\n"
 msgstr "adres�� `%s' vytvo�en\n"
 
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:143
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nemohu pracovat s algoritmem ve�ejn�ho kl��e %d\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:713
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VAROV�N�: potencion�ln� nebezpe�n� symetricky za�ifrov�n kl�� sezen�\n"
 
-#: g10/parse-packet.c:1159
+#: g10/parse-packet.c:1164
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
@@ -5559,12 +5568,12 @@ msgstr ""
 "VAROV�N�: nemohu %%-expandovat URL preferovan�ho keyservery (p��li� dlouh�). "
 "Pou�ity neexpandovan�.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:346
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:355
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s podpis od: \"%s\"\n"
@@ -5587,12 +5596,12 @@ msgstr ""
 msgid "signing:"
 msgstr "podepisuji:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1101
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete vytv��et jen �iteln� podpisy s kl��i form�tu PGP-2.x\n"
 
-#: g10/sign.c:1278
+#: g10/sign.c:1280
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�ito �ifrov�n� %s\n"
diff --git a/po/da.po b/po/da.po
index a47b210f2..f7897e506 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: [email protected]\n"
-"POT-Creation-Date: 2006-12-04 15:05+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2003-12-03 16:11+0100\n"
 "Last-Translator: Birger Langkjer <[email protected]>\n"
 "Language-Team: Danish <[email protected]>\n"
@@ -42,10 +42,10 @@ msgstr "skriver hemmeligt certifikat til '%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
+#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -78,9 +78,9 @@ msgstr "kan ikke �bne '%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
+#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
+#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
@@ -392,14 +392,14 @@ msgstr "hemmelig n�gle ikke tilg�ngelig"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
+#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr ""
 
 #: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
+#: g10/keygen.c:1456
 msgid "Your selection? "
 msgstr "Dit valg? "
 
@@ -578,8 +578,8 @@ msgstr "   (%d) ElGamal (krypt�r kun)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
+#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
@@ -603,7 +603,7 @@ msgstr "hemmelig n�gle ikke tilg�ngelig"
 msgid "secret key already stored on a card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1319 g10/keyedit.c:1351
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
@@ -612,7 +612,7 @@ msgstr "afslut denne menu"
 msgid "show admin commands"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1322 g10/keyedit.c:1354
 msgid "show this help"
 msgstr "vis denne hj�lp"
 
@@ -669,7 +669,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1457 g10/keyedit.c:1617
 msgid "Command> "
 msgstr ""
 
@@ -688,7 +688,7 @@ msgstr "konfliktende kommandoer\n"
 msgid "Admin commands are not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1602 g10/keyedit.c:2238
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
@@ -746,7 +746,7 @@ msgstr "Gentag kodes�tning: "
 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:3868 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -756,7 +756,7 @@ msgstr "kan ikke �bne `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3386 g10/keyserver.c:1705
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -803,7 +803,7 @@ msgstr ""
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:213 g10/sign.c:1286
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
@@ -869,12 +869,12 @@ msgstr ""
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypteret for: %s\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:292
 #, c-format
 msgid "%s encrypted data\n"
 msgstr ""
 
-#: g10/encr-data.c:93 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:296
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
@@ -1009,7 +1009,7 @@ msgstr ""
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:379
 msgid ""
 "@Commands:\n"
 " "
@@ -1017,132 +1017,132 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/gpg.c:380
+#: g10/gpg.c:381
 msgid "|[file]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "|[file]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:383
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "encrypt data"
 msgstr "krypt�r data"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "encryption only with symmetric cipher"
 msgstr "krypt�r kun med symmetriske cifre"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "decrypt data (default)"
 msgstr "afkrypt�r data (standard)"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "list keys"
 msgstr "vis n�gler"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:394
 msgid "list keys and signatures"
 msgstr "vis n�gler og signaturer"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tjek n�glesignaturer"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "list keys and fingerprints"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "list secret keys"
 msgstr "vis hemmelige n�gler"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "generate a new key pair"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "fjern n�gle fra den offentlige n�glering"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "sign a key"
 msgstr "sign�r en n�gle"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "sign a key locally"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:404
 msgid "sign or edit a key"
 msgstr "sign�r eller redig�r en n�gle"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "generate a revocation certificate"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "export keys"
 msgstr "eksport�r n�gler"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:408
 msgid "export keys to a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:409
 msgid "import keys from a key server"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:413
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:417
 msgid "import/merge keys"
 msgstr "import�r/fusion�r n�gler"
 
-#: g10/gpg.c:419
+#: g10/gpg.c:420
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:421
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:422
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "update the trust database"
 msgstr "opdat�r tillidsdatabasen"
 
-#: g10/gpg.c:437
+#: g10/gpg.c:438
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|print meddelelsesresum�"
 
-#: g10/gpg.c:441 g10/gpgv.c:71
+#: g10/gpg.c:442 g10/gpgv.c:70
 msgid ""
 "@\n"
 "Options:\n"
@@ -1152,57 +1152,57 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/gpg.c:445
+#: g10/gpg.c:446
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|krypt�r for NAME"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "use this user-id to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:458
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
 
-#: g10/gpg.c:462
+#: g10/gpg.c:463
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:477
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: g10/gpg.c:478 g10/gpgv.c:73
+#: g10/gpg.c:479 g10/gpgv.c:72
 msgid "verbose"
 msgstr "meddelsom"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "do not make any changes"
 msgstr "lav ingen �ndringer"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:491
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:531
+#: g10/gpg.c:532
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:532
+#: g10/gpg.c:533
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:564
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1222,16 +1222,16 @@ msgstr ""
 " --list-keys [navne]        vis n�gler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/gpg.c:763 g10/gpgv.c:98
+#: g10/gpg.c:766 g10/gpgv.c:97
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:783
 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:783
+#: g10/gpg.c:786
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1241,7 +1241,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/gpg.c:794
+#: g10/gpg.c:797
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1249,585 +1249,590 @@ msgstr ""
 "\n"
 "Underst�ttede algoritmer:\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:803 g10/keyedit.c:2310
+#: g10/gpg.c:806 g10/keyedit.c:2304
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:809
+#: g10/gpg.c:812
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:815 g10/keyedit.c:2356
+#: g10/gpg.c:818 g10/keyedit.c:2350
 #, fuzzy
 msgid "Compression: "
 msgstr "Kommentar: "
 
-#: g10/gpg.c:898
+#: g10/gpg.c:901
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/gpg.c:1046
+#: g10/gpg.c:1049
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1067
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1276
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1288
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1300
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1444
+#: g10/gpg.c:1447
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1954
+#: g10/gpg.c:1957
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/gpg.c:1996
+#: g10/gpg.c:1999
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/gpg.c:2000
+#: g10/gpg.c:2003
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: g10/gpg.c:2007
+#: g10/gpg.c:2010
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/gpg.c:2236
+#: g10/gpg.c:2239
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2402 g10/gpg.c:2414
+#: g10/gpg.c:2405 g10/gpg.c:2417
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2494
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "%s er ikke et gyldigt tegns�t\n"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2768
+#: g10/gpg.c:2773
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2771
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/gpg.c:2858
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2875
 #, 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:2880
+#: g10/gpg.c:2890
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/gpg.c:2894
+#: g10/gpg.c:2904
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2900
+#: g10/gpg.c:2910
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2916
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2919
+#: g10/gpg.c:2929
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:2986 g10/gpg.c:3010
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:2992 g10/gpg.c:3016
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:2998
+#: g10/gpg.c:3008
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3004
+#: g10/gpg.c:3014
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3029
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3031
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3033
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3035
 #, 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:3027
+#: g10/gpg.c:3037
 #, 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:3030
+#: g10/gpg.c:3040
 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:3034
+#: g10/gpg.c:3044
 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:3041
+#: g10/gpg.c:3051
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3060
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3064
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3058
+#: g10/gpg.c:3068
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3091
+#: g10/gpg.c:3101
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3148
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3153
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3158
 #, 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:3250
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3271
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3291
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3314
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3306
+#: g10/gpg.c:3316
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3319
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3365
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3367
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3370
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3390
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/gpg.c:3426
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [bruger-id] [n�glering]"
 
-#: g10/gpg.c:3560
+#: g10/gpg.c:3570
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3572
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3564
+#: g10/gpg.c:3574
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3585
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3595
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3644
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/gpg.c:3854
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3858
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4172
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4174
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4207
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
@@ -1852,45 +1857,45 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2380 g10/keyedit.c:3712
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 
-#: g10/getkey.c:2611
+#: g10/getkey.c:2614
 #, 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:2658
+#: g10/getkey.c:2661
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:73
 msgid "be somewhat more quiet"
 msgstr "v�r mere stille"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "Slet denne n�gle fra n�gleringen? "
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:76
 #, fuzzy
 msgid "make timestamp conflicts only a warning"
 msgstr "tidsstempelkonflikt"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:77
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinfo til denne FD"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:101
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:104
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2325,7 +2330,7 @@ msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 msgid "no writable keyring found: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til `%s'\n"
@@ -2673,445 +2678,445 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
+#: g10/keyedit.c:890 g10/keyedit.c:1736
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
+#: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:824
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:842
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:883
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:885
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:910
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:927
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:951
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:958
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:964
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:972
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:982
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:989
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:996
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1001
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1006
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1016
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
-#: g10/keyedit.c:5004 g10/sign.c:352
+#: g10/keyedit.c:1061 g10/keyedit.c:4793 g10/keyedit.c:4884 g10/keyedit.c:4948
+#: g10/keyedit.c:5009 g10/sign.c:351
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1126
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1137 g10/keygen.c:3215
 msgid "This key is not protected.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1145 g10/keygen.c:3218
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1149 g10/keygen.c:3222
 msgid "Key is protected.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1173
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan ikke redigere denne n�gle: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1179
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1188 g10/keygen.c:1895
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1193
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1196
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1267
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1353
 msgid "save and quit"
 msgstr "gem og afslut"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1356
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1357
 msgid "list key and user IDs"
 msgstr "vis n�gler og bruger-id'er"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1359
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1360
 #, fuzzy
 msgid "select subkey N"
 msgstr "v�lg sekund�r n�gle N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1361
 #, fuzzy
 msgid "check signatures"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1366
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a trust signature"
 msgstr ""
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1379
 msgid "add a user ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1381
 #, fuzzy
 msgid "add a photo ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1383
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "slet bruger id"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1388
 #, fuzzy
 msgid "add a subkey"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1392
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1394
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1396
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "slet sekund�r n�gle"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "add a revocation key"
 msgstr "tilf�j sekund�r n�gle"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1406
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1408
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1439
 msgid "revoke key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "sl� n�gle til"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "sl� n�gle fra"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1442
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1446
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1564
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1582
 msgid "Secret key is available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1663
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1671
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1690
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3119,172 +3124,172 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1730
 #, fuzzy
 msgid "Key is revoked."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1749
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1765
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "ukendt signaturklasse"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1788
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1812
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1814
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1815
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1865
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1877
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1905
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1960
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1963
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vil du gerne oprette en underskrivnings- og krypteringsn�gle? "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1964
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:1999
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2000
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2018
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2029
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vil du gerne oprette en underskrivnings- og krypteringsn�gle? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2081
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2123
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2199
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gem �ndringer? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2202
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Afslut uden at gemme? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2212
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2226
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2327
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2379
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2390
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2405 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2413 g10/keyedit.c:2414
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3292,544 +3297,544 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2624
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2683
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2704
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2710
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keyedit.c:2726 g10/keyedit.c:2782 g10/keyedit.c:2843 g10/keyedit.c:2858
 #: g10/keylist.c:194 g10/keyserver.c:511
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2729 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2731 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2733 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2735
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2754
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2761
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2789 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2813
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "udl�b"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2944
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3005
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3351
+#: g10/keyedit.c:3010 g10/keyedit.c:3345
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3016
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3156
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3166
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3170
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3176
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3190
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3191
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3194
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3227 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "ugyldig rustning"
 
-#: g10/keyedit.c:3235
+#: g10/keyedit.c:3229
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3242
+#: g10/keyedit.c:3236
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3237
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3246
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3340
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3351
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3371
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Indtast n�glens st�rrelse"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3396
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3417
+#: g10/keyedit.c:3411
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3439
+#: g10/keyedit.c:3433
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3452
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3464
+#: g10/keyedit.c:3458
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:3525
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3531
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3530
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3538
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3582
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3598
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3678
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3679
+#: g10/keyedit.c:3684
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3841
+#: g10/keyedit.c:3846
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
+#: g10/keyedit.c:3885 g10/keyedit.c:3995 g10/keyedit.c:4115 g10/keyedit.c:4256
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/keyedit.c:4051
+#: g10/keyedit.c:4056
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4131
+#: g10/keyedit.c:4136
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:4132
+#: g10/keyedit.c:4137
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4199
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4348
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Overskriv (j/N)? "
 
-#: g10/keyedit.c:4407
+#: g10/keyedit.c:4412
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4470
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4492
+#: g10/keyedit.c:4497
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4627
+#: g10/keyedit.c:4632
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4635 g10/keyedit.c:4699 g10/keyedit.c:4742
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4641
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:4640
+#: g10/keyedit.c:4645
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:4644
+#: g10/keyedit.c:4649
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:4671
+#: g10/keyedit.c:4676
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4697
+#: g10/keyedit.c:4702
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4709
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4731
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4746
+#: g10/keyedit.c:4751
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4781
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:4846
+#: g10/keyedit.c:4851
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:4863
+#: g10/keyedit.c:4868
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4927
+#: g10/keyedit.c:4932
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:4989
+#: g10/keyedit.c:4994
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:5084
+#: g10/keyedit.c:5089
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:876
 #, fuzzy
 msgid "writing direct signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:915
 msgid "writing self signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:965
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
+#: g10/keygen.c:2776
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1331
 #, fuzzy
 msgid "Sign"
 msgstr "sign�r"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1334
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1337
 #, fuzzy
 msgid "Encrypt"
 msgstr "krypt�r data"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1340
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1348
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1367
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1371
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1376
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1379
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1382
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1385
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1441
 msgid "Please select what kind of key you want:\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1443
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA og ElGamal (standard)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sign�r kun)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1449
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (sign�r kun)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1451
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1453
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1522
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA n�glepar vil have 1024 bit.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1532
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1539
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Hvilken n�glest�rrelse �nsker du? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1553
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1559
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1564 g10/keygen.c:1569
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1618
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3839,7 +3844,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1629
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3849,52 +3854,52 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Key is valid for? (0) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1673
 msgid "invalid value\n"
 msgstr "ugyldig v�rdi\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1680
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "N�glen udl�ber aldrig\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "N�glen udl�ber aldrig\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1686
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1687
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1693
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
 # virker j automatisk istedetfor y?
-#: g10/keygen.c:1692
+#: g10/keygen.c:1698
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt (j/n)? "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1713
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3904,44 +3909,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1726
 msgid "Real name: "
 msgstr "Rigtige navn: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Invalid character in name\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name may not start with a digit\n"
 msgstr "Navn m� ikke starte med et tal\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1738
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navn skal v�re mindst 5 bogstaver langt\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1746
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1752
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1760
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1766
 msgid "Invalid character in comment\n"
 msgstr "Ugyldigt tegn i kommentar\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1789
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruger '%s' tegns�ttet.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1795
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3952,7 +3957,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1800
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -3967,24 +3972,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1826
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�ndr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�ndr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:1846
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1886
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3992,12 +3997,12 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:1896 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1902
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4005,7 +4010,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:1924
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4013,92 +4018,92 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2722
 msgid "Key generation canceled.\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:2921 g10/keygen.c:3068
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:2923 g10/keygen.c:3071
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:2926 g10/keygen.c:3074
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3057
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3063
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3081
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3088
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3111
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�gle oprettet og signeret.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3122
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3197 g10/keygen.c:3326
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3236 g10/keygen.c:3359
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3524
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3571
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3597
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "hemmelige n�gler import: %lu\n"
@@ -4387,212 +4392,216 @@ msgstr "kan ikke �bne %s: %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:239
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s/%s krypteret for: %s\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:300
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "ukendt cifferalgoritme "
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:381
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "Offentlig n�gle er sl�et fra.\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:438
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:471
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:476 g10/pkclist.c:219
+#: g10/mainproc.c:475 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:479
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:493
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:507
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:509
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:540 g10/mainproc.c:562
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "krypt�r data"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:548
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:581
+#: g10/mainproc.c:580
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:584
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:597
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:603
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:624
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:626
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:711
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr ""
+
+#: g10/mainproc.c:839
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1187
 #, fuzzy
 msgid "no signature found\n"
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1430
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1539
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1550
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1555
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1544
+#: g10/mainproc.c:1575
 #, fuzzy
 msgid "Key available at: "
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "D�RLIG signatur fra \""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1797
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1895
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1900
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1903
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "ukendt version"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:2037
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2013
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -4728,16 +4737,16 @@ msgstr ""
 msgid "directory `%s' created\n"
 msgstr "%s: mappe oprettet\n"
 
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:143
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:713
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1159
+#: g10/parse-packet.c:1164
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -5465,12 +5474,12 @@ msgid ""
 "unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:347
+#: g10/sign.c:346
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:355
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatur fra: %s\n"
@@ -5489,11 +5498,11 @@ msgstr ""
 msgid "signing:"
 msgstr "signerer:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1101
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1278
+#: g10/sign.c:1280
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index 2528a1477..98a42a074 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: [email protected]\n"
-"POT-Creation-Date: 2007-02-26 15:57+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2006-06-28 20:54+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -41,7 +41,7 @@ msgstr "es wird auf die Sperre `%s' gewartet...\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3514 g10/import.c:195 g10/keygen.c:2392
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
 #: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
 #: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -720,7 +720,7 @@ msgstr "Geben Sie die PIN nochmal ein: "
 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:3879 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -1410,7 +1410,7 @@ msgstr "Optionendatei '%s': %s\n"
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2864 g10/gpg.c:2883
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht für den üblichen Gebrauch gedacht!\n"
@@ -1432,7 +1432,7 @@ msgstr "`%s' ist kein gültiges Unterschriftablaufdatum\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' ist kein gültiger Zeichensatz\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2705 g10/keyedit.c:4074
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 msgid "could not parse keyserver URL\n"
 msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
 
@@ -1507,321 +1507,326 @@ msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
 #: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "Alle Notationen wahrend der Signaturprüfung anzeigen"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ungültige Überprüfuns-Option.\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2603
 msgid "invalid verify options\n"
 msgstr "Ungültige Überprüfungs-Option\n"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2610
 #, 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:2771
+#: g10/gpg.c:2773
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ungültige Überprüfuns-Option.\n"
 
-#: g10/gpg.c:2774
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2853
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
 
-#: g10/gpg.c:2857
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/gpg.c:2869
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/gpg.c:2876
+#: g10/gpg.c:2875
 #, 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:2891
+#: g10/gpg.c:2890
 #, 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:2905
+#: g10/gpg.c:2904
 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:2911
+#: g10/gpg.c:2910
 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:2917
+#: g10/gpg.c:2916
 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:2930
+#: g10/gpg.c:2929
 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:2997 g10/gpg.c:3021
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3003 g10/gpg.c:3027
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3009
+#: g10/gpg.c:3008
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3014
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3029
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed müssen größer als 0 sein\n"
 
-#: g10/gpg.c:3032
+#: g10/gpg.c:3031
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed müssen größer als 1 sein\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3033
 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:3036
+#: g10/gpg.c:3035
 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:3038
+#: g10/gpg.c:3037
 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:3041
+#: g10/gpg.c:3040
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3044
 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:3052
+#: g10/gpg.c:3051
 msgid "invalid default preferences\n"
 msgstr "ungültige Standard Voreinstellungen\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3060
 msgid "invalid personal cipher preferences\n"
 msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
 
-#: g10/gpg.c:3065
+#: g10/gpg.c:3064
 msgid "invalid personal digest preferences\n"
 msgstr "ungültige private Hashvoreinstellungen\n"
 
-#: g10/gpg.c:3069
+#: g10/gpg.c:3068
 msgid "invalid personal compress preferences\n"
 msgstr "ungültige private Komprimierungsvoreinstellungen\n"
 
-#: g10/gpg.c:3102
+#: g10/gpg.c:3101
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/gpg.c:3149
+#: g10/gpg.c:3148
 #, 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:3154
+#: g10/gpg.c:3153
 #, 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:3159
+#: g10/gpg.c:3158
 #, 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:3261
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3271
 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:3283
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/gpg.c:3290
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3291
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3314
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [Dateiname]"
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3316
 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:3320
+#: g10/gpg.c:3319
 #, 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:3338
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/gpg.c:3351
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3366
+#: g10/gpg.c:3365
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3367
 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:3371
+#: g10/gpg.c:3370
 #, 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:3391
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/gpg.c:3425
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schlüsselbund]"
 
-#: g10/gpg.c:3571
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3573
+#: g10/gpg.c:3572
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3574
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schlüsselexport fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3586
+#: g10/gpg.c:3585
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3595
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3655
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3742
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ungültiges Hashverfahren '%s'\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/gpg.c:4173
+#: g10/gpg.c:4172
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4175
+#: g10/gpg.c:4174
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4208
+#: g10/gpg.c:4207
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n"
@@ -1846,19 +1851,19 @@ 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:2380 g10/keyedit.c:3717
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, 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:2611
+#: g10/getkey.c:2614
 #, 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:2658
+#: g10/getkey.c:2661
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
@@ -3532,13 +3537,13 @@ msgstr ""
 "Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n"
 
 #: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
-#: g10/mainproc.c:1794 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[widerrufen]"
 
 #: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
-#: g10/mainproc.c:1796 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4710,107 +4715,107 @@ msgstr "Korrekte Unterschrift von \""
 msgid "signature verification suppressed\n"
 msgstr "Unterschriften-Überprüfung unterdrückt\n"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1539
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "diese Mehrfachunterschriften können nicht behandelt werden\n"
 
-#: g10/mainproc.c:1541
+#: g10/mainproc.c:1550
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/mainproc.c:1542
+#: g10/mainproc.c:1551
 #, 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:1546
+#: g10/mainproc.c:1555
 #, 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:1566
+#: g10/mainproc.c:1575
 msgid "Key available at: "
 msgstr "Schlüssel erhältlich bei: "
 
-#: g10/mainproc.c:1699 g10/mainproc.c:1747
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:1701 g10/mainproc.c:1749
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Verfallene Unterschrift von \""
 
-#: g10/mainproc.c:1703 g10/mainproc.c:1751
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1755
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr "[ungewiß]  "
 
-#: g10/mainproc.c:1787
+#: g10/mainproc.c:1797
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                    alias \""
 
-#: g10/mainproc.c:1885
+#: g10/mainproc.c:1895
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/mainproc.c:1890
+#: g10/mainproc.c:1900
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Diese Unterschrift verfällt am %s.\n"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1903
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
 
-#: g10/mainproc.c:1894
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr "Binäre"
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr "Textmodus"
 
-#: g10/mainproc.c:1895 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 msgid "unknown"
 msgstr "unbekannt"
 
-#: g10/mainproc.c:1915
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht geprüft werden: %s\n"
 
-#: g10/mainproc.c:1984 g10/mainproc.c:2000 g10/mainproc.c:2086
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
 msgstr "keine abgetrennte Unterschrift\n"
 
-#: g10/mainproc.c:2027
+#: g10/mainproc.c:2037
 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:2035
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:2092
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ungültiges root-Paket in proc_tree() entdeckt\n"
 
diff --git a/po/el.po b/po/el.po
index 5b0716904..68e1aeab4 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: [email protected]\n"
-"POT-Creation-Date: 2006-12-04 15:05+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2003-06-27 12:00+0200\n"
 "Last-Translator: Dokianakis Theofanis <[email protected]>\n"
 "Language-Team: Greek <[email protected]>\n"
@@ -40,10 +40,10 @@ msgstr "������� ��� �������� �������� ��� `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
+#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -78,9 +78,9 @@ msgstr "�������� ��������� ��� `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "��������: ��� ���� ��������� �� ������ random_seed\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
+#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
+#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
@@ -394,15 +394,15 @@ msgstr "�� ������� ������ ��� ����� ���������"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
+#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
+#: g10/keygen.c:1456
 msgid "Your selection? "
 msgstr "� ������� ���; "
 
@@ -580,8 +580,8 @@ msgstr "   (%d) RSA (��� ������������� ����)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
+#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "�� ������ �������.\n"
 
@@ -605,7 +605,7 @@ msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 msgid "secret key already stored on a card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1319 g10/keyedit.c:1351
 msgid "quit this menu"
 msgstr "����������� ����� ��� �����"
 
@@ -614,7 +614,7 @@ msgstr "����������� ����� ��� �����"
 msgid "show admin commands"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1322 g10/keyedit.c:1354
 msgid "show this help"
 msgstr "���������� ����� ��� ��������"
 
@@ -671,7 +671,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1457 g10/keyedit.c:1617
 msgid "Command> "
 msgstr "������> "
 
@@ -690,7 +690,7 @@ msgstr "������������� �������\n"
 msgid "Admin commands are not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1602 g10/keyedit.c:2238
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�� ������ ������  (��������� \"help\")\n"
 
@@ -745,7 +745,7 @@ msgstr "����������� �� ����� ������: "
 msgid "PIN not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 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,7 +755,7 @@ 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:3392 g10/keyserver.c:1705
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3386 g10/keyserver.c:1705
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -805,7 +805,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "��������������� ����� ��� ������� \"--delete-secret-key\" ��� �������� ���.\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:213 g10/sign.c:1286
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
@@ -881,12 +881,12 @@ msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s ��������������� ���: \"%s\"\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:292
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s ��������������� ��������\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:296
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "��������������� �� ������� ��������� %d\n"
@@ -1032,7 +1032,7 @@ msgstr "�������������: �� ������� ������ %08lX ��� ���� ���� SK checksum\n"
 msgid "WARNING: nothing exported\n"
 msgstr "�������������: ��� ����� ������ �������\n"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:379
 msgid ""
 "@Commands:\n"
 " "
@@ -1040,128 +1040,128 @@ msgstr ""
 "@�������:\n"
 " "
 
-#: g10/gpg.c:380
+#: g10/gpg.c:381
 msgid "|[file]|make a signature"
 msgstr "|[������]|���������� ���� ���������"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "|[file]|make a clear text signature"
 msgstr "|[������]|���������� ���� �� ���������������� ���������"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:383
 msgid "make a detached signature"
 msgstr "���������� ���� �� ������������� ���������"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "encrypt data"
 msgstr "������������� ���������"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "encryption only with symmetric cipher"
 msgstr "������������� �� ����� ���� ����������� ����������"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "decrypt data (default)"
 msgstr "���������������� ��������� (��������������)"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "verify a signature"
 msgstr "���������� ���� ���������"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "list keys"
 msgstr "���������� ��� ������ ��������"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:394
 msgid "list keys and signatures"
 msgstr "���������� ��� ������ �������� ��� ���������"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "������� ��������� ��������"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "list keys and fingerprints"
 msgstr "���������� ��� ������ �������� ��� ������������ (fingerprints)"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "list secret keys"
 msgstr "���������� ��� ������ �������� ��������"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "generate a new key pair"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "remove keys from the public keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "remove keys from the secret keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "sign a key"
 msgstr "�������� ���� ��������"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "sign a key locally"
 msgstr "�������� ���� �������� ������"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:404
 msgid "sign or edit a key"
 msgstr "�������� � ����������� ���� ��������"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "generate a revocation certificate"
 msgstr "���������� ���� �������������� ���������"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "export keys"
 msgstr "������� ��������"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:408
 msgid "export keys to a key server"
 msgstr "������� �������� �� ��� ���������� ��������"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:409
 msgid "import keys from a key server"
 msgstr "�������� �������� ��� ��� ���������� ��������"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "search for keys on a key server"
 msgstr "��������� �������� �� ��� ���������� ��������"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:413
 msgid "update all keys from a keyserver"
 msgstr "�������� ���� ��� �������� ��� ��� ���������� ��������"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:417
 msgid "import/merge keys"
 msgstr "��������/���������� ��������"
 
-#: g10/gpg.c:419
+#: g10/gpg.c:420
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:421
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:422
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "update the trust database"
 msgstr "�������� ��� ����� ��������� ������������"
 
-#: g10/gpg.c:437
+#: g10/gpg.c:438
 msgid "|algo [files]|print message digests"
 msgstr "|����� [������]| ���������� ���������� ��� ���������"
 
-#: g10/gpg.c:441 g10/gpgv.c:71
+#: g10/gpg.c:442 g10/gpgv.c:70
 msgid ""
 "@\n"
 "Options:\n"
@@ -1171,51 +1171,51 @@ msgstr ""
 "��������:\n"
 " "
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "create ascii armored output"
 msgstr "���������� ascii ������������ ������"
 
-#: g10/gpg.c:445
+#: g10/gpg.c:446
 msgid "|NAME|encrypt for NAME"
 msgstr "|�����|������������� ��� �����"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "use this user-id to sign or decrypt"
 msgstr "����� ����� ��� ���������� (user id) ��� �������� � ����������������"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:458
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|���������� �������� ��������� N (0 �������������)"
 
-#: g10/gpg.c:462
+#: g10/gpg.c:463
 msgid "use canonical text mode"
 msgstr "����� ��������� ���������� ��������"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:477
 msgid "use as output file"
 msgstr "����� �� ������� ������"
 
-#: g10/gpg.c:478 g10/gpgv.c:73
+#: g10/gpg.c:479 g10/gpgv.c:72
 msgid "verbose"
 msgstr "���������"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "do not make any changes"
 msgstr "�� �� ����� ������ ������"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:491
 msgid "prompt before overwriting"
 msgstr "������� ���� ��� ���������"
 
-#: g10/gpg.c:531
+#: g10/gpg.c:532
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:532
+#: g10/gpg.c:533
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1223,7 +1223,7 @@ msgstr ""
 "@\n"
 "(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
 
-#: g10/gpg.c:564
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1243,15 +1243,15 @@ msgstr ""
 " --list-keys [�������]        ���������� ��������\n"
 " --fingerprint [�������]      ���������� ������������ (fingerprints)\n"
 
-#: g10/gpg.c:763 g10/gpgv.c:98
+#: g10/gpg.c:766 g10/gpgv.c:97
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "��������� �� ���������� ��� <[email protected]>\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:783
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1261,7 +1261,7 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: g10/gpg.c:794
+#: g10/gpg.c:797
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1269,589 +1269,594 @@ msgstr ""
 "\n"
 "��������������� ����������:\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid "Pubkey: "
 msgstr "�����������:"
 
-#: g10/gpg.c:803 g10/keyedit.c:2310
+#: g10/gpg.c:806 g10/keyedit.c:2304
 msgid "Cipher: "
 msgstr "���������������: "
 
-#: g10/gpg.c:809
+#: g10/gpg.c:812
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2356
+#: g10/gpg.c:818 g10/keyedit.c:2350
 msgid "Compression: "
 msgstr "��������: "
 
-#: g10/gpg.c:898
+#: g10/gpg.c:901
 msgid "usage: gpg [options] "
 msgstr "�����: gpg [��������] "
 
-#: g10/gpg.c:1046
+#: g10/gpg.c:1049
 msgid "conflicting commands\n"
 msgstr "������������� �������\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1067
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "��� ������� �� ������� = ���� ������ ��� ������ \"%s\"\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1300
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1444
+#: g10/gpg.c:1447
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "������� ����������� ��������� \"%s\"\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "���������� ��� ����������� ���� ����� ��������� �� ������"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1954
+#: g10/gpg.c:1957
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
 
-#: g10/gpg.c:1996
+#: g10/gpg.c:1999
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
-#: g10/gpg.c:2000
+#: g10/gpg.c:2003
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: g10/gpg.c:2007
+#: g10/gpg.c:2010
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
 
-#: g10/gpg.c:2236
+#: g10/gpg.c:2239
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "� �������� ��� ��������������� \"%s\" ��� ��������� ������ ��������\n"
 "���������� ������\n"
 
-#: g10/gpg.c:2402 g10/gpg.c:2414
+#: g10/gpg.c:2405 g10/gpg.c:2417
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2494
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "�� %s ��� ����� ������ ��� ����������\n"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�������� ������� ��� exec-path �� %s\n"
 
-#: g10/gpg.c:2768
+#: g10/gpg.c:2773
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2771
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�������������: �� %s ����������� �� %s\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: g10/gpg.c:2858
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2875
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: g10/gpg.c:2880
+#: g10/gpg.c:2890
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/gpg.c:2894
+#: g10/gpg.c:2904
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
 
-#: g10/gpg.c:2900
+#: g10/gpg.c:2910
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
 "���������\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2916
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
 
-#: g10/gpg.c:2919
+#: g10/gpg.c:2929
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
 
-#: g10/gpg.c:2986 g10/gpg.c:3010
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:2992 g10/gpg.c:3016
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
-#: g10/gpg.c:2998
+#: g10/gpg.c:3008
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:3004
+#: g10/gpg.c:3014
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "� ����������� ���������� ��������� ��� �����������\n"
 "��� ����� �������\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3029
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3031
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3033
 #, 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:3025
+#: g10/gpg.c:3035
 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:3027
+#: g10/gpg.c:3037
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3040
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3044
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3051
 msgid "invalid default preferences\n"
 msgstr "�� ������� �����������\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3060
 msgid "invalid personal cipher preferences\n"
 msgstr "�� ������� ����������� ���������� ���������������\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3064
 msgid "invalid personal digest preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3058
+#: g10/gpg.c:3068
 msgid "invalid personal compress preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3091
+#: g10/gpg.c:3101
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3148
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3153
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3158
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3271
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "�������������: ������� ���������� (-r) ����� ����� ��������������\n"
 "�������� ��������\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [����� �������]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3291
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [����� �������]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3314
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3306
+#: g10/gpg.c:3316
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3319
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [����� �������]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3365
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3367
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3370
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [����� �������]"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [����� �������]"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [����� �������]"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3426
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [�������]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [����������]"
 
-#: g10/gpg.c:3560
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3572
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/gpg.c:3564
+#: g10/gpg.c:3574
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "������� �������� �������: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3585
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver ��������� �������: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3595
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: g10/gpg.c:3644
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: g10/gpg.c:3854
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[����� �������]"
 
-#: g10/gpg.c:3858
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4172
 msgid "the given certification policy URL is invalid\n"
 msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4174
 msgid "the given signature policy URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4207
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
@@ -1877,42 +1882,42 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "�� ������ ������ %08lX ����� ������ ��� �� --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2380 g10/keyedit.c:3712
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "������ ������� ��������� ��� �� ������� ��������� %08lX - �������\n"
 
-#: g10/getkey.c:2611
+#: g10/getkey.c:2614
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
 
-#: g10/getkey.c:2658
+#: g10/getkey.c:2661
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:73
 msgid "be somewhat more quiet"
 msgstr "����� ������"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "take the keys from this keyring"
 msgstr "������� ��� �������� ��� ���� �� ����������"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:76
 msgid "make timestamp conflicts only a warning"
 msgstr "������� ��� ����������� ���� (timestamp) ���� ��� �������������"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:77
 msgid "|FD|write status info to this FD"
 msgstr "|FD|������� ��� ����������� ���������� ��� FD"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:101
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "�����: gpgv [��������] [������] (-h ��� �������)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:104
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2445,7 +2450,7 @@ msgstr "������ %08lX:  ��� ������ - ������������\n"
 msgid "no writable keyring found: %s\n"
 msgstr "��� ������� ��������� ����������: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "������� ���  `%s'\n"
@@ -2809,42 +2814,42 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
+#: g10/keyedit.c:890 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "������� ������ ����� �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
+#: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  �������� ���������.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "�� user ID \"%s\" ���� �����."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "������� �� ���������; "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2853,11 +2858,11 @@ msgstr ""
 "� ����-�������� ��� \"%s\"\n"
 "����� ��� �������� ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "������ �� �� �������� �� ��� OpenPGP ����-��������; (y/N) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2866,12 +2871,12 @@ msgstr ""
 "� ������������ �������� ��� ��� \"%s\"\n"
 "���� �����.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "������ �� ������� ��� ��� �������� ���� ������������� ��� ��������; (y/N) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2880,43 +2885,43 @@ msgstr ""
 "� ������������ �������� ��� ��� \"%s\"\n"
 "����� ��� ������ ��������.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "������ �� �� �������� �� ��� ����� ��������� ��������; (y/N) "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "������� ������ ����� �� �� ��������������; (y/N) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "������ ��� �� ��������� �� �� ������  %08lX\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "���� �� ������ ���� �����!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "���� �� ������ �������� �� ����� ���� %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "������ � ���������� �� ����� ����������;  (Y/n) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:883
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2924,11 +2929,11 @@ msgstr ""
 "�������� �� ��������������� ��� OpenPGP �������� �� ��� PGP 2.x ���� �� "
 "��������� --pgp2.\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:885
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "���� �� ����� �� ������ ������� �� �� PGP 2.x.\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:910
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2938,32 +2943,32 @@ msgstr ""
 "������ �������� ��� ����������� �����; ��� ��� ������ �� �� ���������� "
 "�������\"0\".\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) ��� ������.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) ��� ��� ������� �������.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ��� ����� ��� ������ ������.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ��� ����� ���������� ������.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:927
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "� ������� ���; (�������������� ? ��� �����������): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:951
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2972,21 +2977,21 @@ msgstr ""
 "������� ������ �� ���������� ���� �� ������\n"
 "�� �� ������ ���: \""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:958
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "���� �� ����� ��� ����-��������.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "�������������: � �������� �� �� ��������� ��� ��-���������.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:972
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
@@ -2994,14 +2999,14 @@ msgstr ""
 "�������������: � �������� �� �� ��������� ��� ��-�����������.\n"
 "\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:982
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "� �������� �� ��������� ��� ��-���������.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:989
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
@@ -3009,65 +3014,65 @@ msgstr ""
 "� �������� �� ��������� ��� ��-�����������.\n"
 "\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "��� ��� ������� ������� ���� �� ������.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1001
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "��� ����� ����������� ������ �� ���� �� ������.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1006
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "��� ������� ���� ���������� ���� �� ������.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1016
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "������� �� ���������; "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
-#: g10/keyedit.c:5004 g10/sign.c:352
+#: g10/keyedit.c:1061 g10/keyedit.c:4793 g10/keyedit.c:4884 g10/keyedit.c:4948
+#: g10/keyedit.c:5009 g10/sign.c:351
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "� �������� �������: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1126
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1137 g10/keygen.c:3215
 msgid "This key is not protected.\n"
 msgstr "���� �� ������ ��� �������������.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1145 g10/keygen.c:3218
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1149 g10/keygen.c:3222
 msgid "Key is protected.\n"
 msgstr "�� ������ �������������.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1173
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "������� � ����������� ����� ��� ��������:%s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1179
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3075,219 +3080,219 @@ msgstr ""
 "�������������� ��� ��� ����� ������ ��� ���� �� ������� ������.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1188 g10/keygen.c:1895
 msgid "passphrase not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1193
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr "��� ������ ����� ������ - ���� ����� ������ *����* ����!\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1196
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "������� ������ �� ������ ����; "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1267
 msgid "moving a key signature to the correct place\n"
 msgstr "���������� ��������� �������� ��� ����� ����\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1353
 msgid "save and quit"
 msgstr "���������� ��� ������"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1356
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "���������� ��� fingerprint"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1357
 msgid "list key and user IDs"
 msgstr "���������� ��� �������� ��� ��� user ID"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1359
 msgid "select user ID N"
 msgstr "������� user ID N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1360
 #, fuzzy
 msgid "select subkey N"
 msgstr "������� user ID N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1361
 #, fuzzy
 msgid "check signatures"
 msgstr "�������� ���������"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1366
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "�������� ��� �������� ������"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "��������: �������� �� user ID ��� ��������\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1379
 msgid "add a user ID"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1381
 msgid "add a photo ID"
 msgstr "�������� ���� photo ID"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1383
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1388
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1392
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1394
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1396
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1402
 msgid "add a revocation key"
 msgstr "�������� ���� �������� ���������"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "�������� ��� user ID ��� ��������"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "������ ������ ��� ����������� �������� ��� �������� ��������"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1413
 msgid "list preferences (expert)"
 msgstr "���������� ����������� (�������)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1415
 msgid "list preferences (verbose)"
 msgstr "���������� �������� (���������)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "������ ��� ������ ������"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "������ ��� ������������ ���������"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "����������� ��� ������"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "������������� ��� ������"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "���������� photo ID"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1446
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1564
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "������ ���� ��� �������� �������� ����� �������� `%s': %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1582
 msgid "Secret key is available.\n"
 msgstr "�� ������� ������ ����� ���������.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1663
 msgid "Need the secret key to do this.\n"
 msgstr "���������� �� ������� ������ ��� �� ����� ����.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1671
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�������� ��������������� ��� ������ \"toggle\" �����.\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1690
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3295,242 +3300,242 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1730
 msgid "Key is revoked."
 msgstr "�� ������ ����������."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1749
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "������� �� ���������� ��� �� user ID; "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1756
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "��������: �������� �� user ID ��� ��������\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1765
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "������� ����� ���������"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1788
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "���� � ������ ����������� �� ���� ��� ��������� %s.\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
 msgid "You must select at least one user ID.\n"
 msgstr "������ �� ��������� �� �������� ��� user ID.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1812
 msgid "You can't delete the last user ID!\n"
 msgstr "��� �������� �� ���������� �� ��������� user ID!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1814
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1815
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1865
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1877
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "������ �� ��������� ����������� ��� ������.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1905
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "�������� ����������� ��� ����������� `%s': %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1960
 msgid "You must select at least one key.\n"
 msgstr "������ �� ��������� ����������� ��� ������.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1963
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "������� ������ �� ���������� �� ���������� �������; "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1964
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:1999
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2000
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2018
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2029
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "������� ������ �� ���������� �� ���������� �������; "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2081
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2123
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "������� ����������� ��������"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "������� �� ���������� �� �����������;"
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2199
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "���������� ��� �������; "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2202
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "����������� ����� ����������; "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2212
 #, c-format
 msgid "update failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "� ��������� �������� �������: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2226
 msgid "Key not changed so no update needed.\n"
 msgstr "�� ������ ��� ������ ����� ��� ���������� ���������.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2327
 msgid "Digest: "
 msgstr "��������: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2379
 msgid "Features: "
 msgstr "����������: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2390
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2405 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2413 g10/keyedit.c:2414
 #, fuzzy
 msgid "Notations: "
 msgstr "��������: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2624
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "��� �������� ����������� �� ��� user ID ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2683
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2704
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2710
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (���������)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keyedit.c:2726 g10/keyedit.c:2782 g10/keyedit.c:2843 g10/keyedit.c:2858
 #: g10/keylist.c:194 g10/keyserver.c:511
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2729 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2731 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2733 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2735
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2754
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2761
 msgid "This key has been disabled"
 msgstr "���� �� ������ ���� ���������������"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2789 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2813
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3538,19 +3543,19 @@ msgstr ""
 "� ���������� ��� ��������������� �������� ��� ����� ���������� �����\n"
 "����� ��� ��� �������������� �� ���������.\n"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2944
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3558,7 +3563,7 @@ msgstr ""
 "�������������: ��� ���� ��������� ID ������ ��� ��������.  ���� � ������\n"
 "              ������ �� ����� ��� ���� ID ������ �� ����� �� ��������.\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3005
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3567,75 +3572,75 @@ msgstr ""
 "�������������: ���� ����� ��� ������ ����� PGP2. � �������� ���� photo ID\n"
 "               ������ �� ����� ������� �������� PGP �� �� ����������.\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3351
+#: g10/keyedit.c:3010 g10/keyedit.c:3345
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "������� ����� ������ �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3016
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "��� �������� �� ���������� ��� photo ID �� ��� ������ ����� PGP2.\n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3156
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�������� ����� ��� ����� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3166
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�������� ����� ��� �� ������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3170
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�������� ����� ��� �������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3176
 msgid "Really delete this self-signature? (y/N)"
 msgstr "������� �� ��������� ���� � ����-��������; (y/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3190
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "����������� %d ��������.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3191
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "����������� %d ���������.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3194
 msgid "Nothing deleted.\n"
 msgstr "������ ��� �����������.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3227 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "�� ������ ��������"
 
-#: g10/keyedit.c:3235
+#: g10/keyedit.c:3229
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:3242
+#: g10/keyedit.c:3236
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3237
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3246
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3340
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3645,38 +3650,38 @@ msgstr ""
 "               ������������ �������� ������ �� ����� ������� �������� PGP\n"
 "               �� �� ����������.\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3351
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "��� �������� �� ���������� ��� ����������� �������� �� ������ ����� PGP2.x.\n"
 
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3371
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�������������� �� user ID ��� ����������� ��������: "
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3396
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
 
-#: g10/keyedit.c:3417
+#: g10/keyedit.c:3411
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "�� �������� �� ������� ��� ������ ��� �� ���������� �������� ��� ������ ���\n"
 
-#: g10/keyedit.c:3439
+#: g10/keyedit.c:3433
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3452
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "�������������: ��� ������� ��� ������ ��� ���������� �������� ��� ������ �� "
 "���������!\n"
 
-#: g10/keyedit.c:3464
+#: g10/keyedit.c:3458
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3684,341 +3689,341 @@ msgstr ""
 "����� �������� ��� ������ �� ������� ��� ������ ��� ���������� ��������; (y/"
 "N): "
 
-#: g10/keyedit.c:3525
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "�������� ��������� ��� �������� ��� �� ������� �������.\n"
 
-#: g10/keyedit.c:3531
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "�������� �������� �� ���� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "������ ����������� ����� ��� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3538
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "������ ����������� ����� ��� ��� �������� ������.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3582
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3598
 msgid "No corresponding signature in secret ring\n"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3678
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "�������������: �� ��������� ��������� %08lX ��� ���� ���' ������������� "
 "������������\n"
 
-#: g10/keyedit.c:3679
+#: g10/keyedit.c:3684
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3841
+#: g10/keyedit.c:3846
 msgid "Please select exactly one user ID.\n"
 msgstr "������ �� ��������� ������� ��� user ID.\n"
 
-#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
+#: g10/keyedit.c:3885 g10/keyedit.c:3995 g10/keyedit.c:4115 g10/keyedit.c:4256
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "������������ � v3 ����-�������� ��� user id \"%s\"\n"
 
-#: g10/keyedit.c:4051
+#: g10/keyedit.c:4056
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4131
+#: g10/keyedit.c:4136
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:4132
+#: g10/keyedit.c:4137
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4199
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "�������� ���������: "
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4348
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "��������� (y/N); "
 
-#: g10/keyedit.c:4407
+#: g10/keyedit.c:4412
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4470
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4492
+#: g10/keyedit.c:4497
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4627
+#: g10/keyedit.c:4632
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4635 g10/keyedit.c:4699 g10/keyedit.c:4742
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ����������� ��� %08lX ���� %s%s%s\n"
 
-#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 msgid " (non-exportable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4641
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���� � �������� ����� ���� %s.\n"
 
-#: g10/keyedit.c:4640
+#: g10/keyedit.c:4645
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:4644
+#: g10/keyedit.c:4649
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� ��� ��������; (y/N)"
 
-#: g10/keyedit.c:4671
+#: g10/keyedit.c:4676
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "����� ��������� ���� �� user ID:\n"
 
-#: g10/keyedit.c:4697
+#: g10/keyedit.c:4702
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4709
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   ���������� ��� %08lX ���� %s\n"
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4731
 msgid "You are about to revoke these signatures:\n"
 msgstr "��������� �� ����������� ����� ��� ���������:\n"
 
-#: g10/keyedit.c:4746
+#: g10/keyedit.c:4751
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "������� �� ������������� �� ������������� ���������; (y/N)"
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4781
 msgid "no secret key\n"
 msgstr "������ ������� ������\n"
 
-#: g10/keyedit.c:4846
+#: g10/keyedit.c:4851
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:4863
+#: g10/keyedit.c:4868
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "�������������: ��� �������� user ID ���� ���������� %d ������� ��� ������\n"
 
-#: g10/keyedit.c:4927
+#: g10/keyedit.c:4932
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:4989
+#: g10/keyedit.c:4994
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:5084
+#: g10/keyedit.c:5089
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "���������� %s photo ID �������� %ld ��� �� ������ 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "� ���������� %c%lu ������������\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "���� ������ `%c' �����������\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "���� ������ `%c' �����������\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "���� ������ `%c' �����������\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:876
 msgid "writing direct signature\n"
 msgstr "������� ������ ���������\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:915
 msgid "writing self signature\n"
 msgstr "������� ����-���������\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:965
 msgid "writing key binding signature\n"
 msgstr "������� ��������� \"�������\" ��������\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
+#: g10/keygen.c:2776
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�� ������ ������� ��������, ����� %u bits\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��������������� ��� ������� �������� ��� %u bits\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1331
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1334
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1337
 #, fuzzy
 msgid "Encrypt"
 msgstr "������������� ���������"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1340
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1348
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1367
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1371
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1376
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1379
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (��� ������������� ����)\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1382
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1385
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1441
 msgid "Please select what kind of key you want:\n"
 msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1443
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA ��� ElGamal (��������������)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (��� �������� ����)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (��� ������������� ����)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (��� �������� ����)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1453
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1522
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "�� ������ �������� DSA �� ����� 1024 bits.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1532
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1539
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�� ������� �������� �� ������; (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1553
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1559
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�� ������� �������� ��� �������� ����� %u bits\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1564 g10/keygen.c:1569
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "����������������� ��� �� %u bits\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1618
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4034,7 +4039,7 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1629
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4050,40 +4055,40 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Key is valid for? (0) "
 msgstr "�� ������ ����� ������ ���; (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "� �������� ����� ������ ���; (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1673
 msgid "invalid value\n"
 msgstr "�� ������ ����\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1680
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "�� %s ��� ����� ����\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "�� %s ��� ����� ����\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1686
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "�� %s ����� ���� %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1687
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1693
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4091,12 +4096,12 @@ msgstr ""
 "�� ������� ��� ��� ������ �� ����������� ����������� ���� ��� 2038.\n"
 "����, �� ����������� ����� ��� �� 2106.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1698
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "����� ���� ����� (y/n); "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1713
 #, fuzzy
 msgid ""
 "\n"
@@ -4113,44 +4118,44 @@ msgstr ""
 "    \"Nikolaoy Nikos (toy Ioanni) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1726
 msgid "Real name: "
 msgstr "������� �����: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Invalid character in name\n"
 msgstr "�� ������� ���������� ��� �����\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name may not start with a digit\n"
 msgstr "�� ����� ��� ����������� �� ������ �� ���������� �����\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1738
 msgid "Name must be at least 5 characters long\n"
 msgstr "�� ����� ������ �� ���� ����������� 5 ����������\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1746
 msgid "Email address: "
 msgstr "��������� Email: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1752
 msgid "Not a valid email address\n"
 msgstr "�� ������ ��������� Email\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1760
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1766
 msgid "Invalid character in comment\n"
 msgstr "�� ������� ���������� ��� ������\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1789
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "�������������� �� `%s' ��� ����������.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1795
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4161,7 +4166,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1800
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�������� ��� ����������� ��� ��������� email ��� ����� � ��� ������\n"
 
@@ -4176,23 +4181,23 @@ msgstr "�������� ��� ����������� ��� ��������� email ��� ����� � ��� ������\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1826
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (Q)�����������; "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (O)�������/(Q)�����������; "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:1846
 msgid "Please correct the error first\n"
 msgstr "��������, ��������� ����� �� ������\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1886
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4200,12 +4205,12 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:1896 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1902
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4217,7 +4222,7 @@ msgstr ""
 "����� ������, �� ��� ������� \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:1924
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4229,50 +4234,50 @@ msgstr ""
 "���� �������) ���� �� �������� ����������� ������ �������. ���� �����\n"
 "��� ��������� ������� ������� ��� �������� �� ������� ������ ��������.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2722
 msgid "Key generation canceled.\n"
 msgstr "� ���������� �������� ����������.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:2921 g10/keygen.c:3068
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:2923 g10/keygen.c:3071
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:2926 g10/keygen.c:3074
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3057
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3063
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3081
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3088
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3111
 msgid "public and secret key created and signed.\n"
 msgstr "�� ������� ��� �� ������� ������ �������������� ��� �����������.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3122
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4283,12 +4288,12 @@ msgstr ""
 "�������� �� ��������������� ��� ������ \"--edit-key\" ��� �� ������������\n"
 "��� ���������� ������ ��� ���� �� ����.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4296,7 +4301,7 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4304,28 +4309,28 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3197 g10/keygen.c:3326
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "��������: � ���������� ����������� ��� ������� v3 ��� ����� �������\n"
 "�� �� OpenPGP\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3236 g10/keygen.c:3359
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "������� �� ������������; "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3524
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3571
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3597
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
@@ -4611,210 +4616,214 @@ msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:239
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "�������� ������� ��� ��� ������ ���������������� ��������� (%d)\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s ������ ���������������� ��������\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:300
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "��������������� �� ������� ��������� %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:381
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "������� ������ ����� %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:438
 msgid "public key encrypted data: good DEK\n"
 msgstr "��������������� �������� �� ������� ������: ���� DEK\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:471
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:475 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:479
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "��������������� �� %s key, ID %08lX\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:493
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "������������� �� ������� ������ �������: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:507
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "��������������� �� %lu ������� �������\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:509
 msgid "encrypted with 1 passphrase\n"
 msgstr "��������������� �� 1 ����� ������\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:540 g10/mainproc.c:562
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "������� %s ���������������� ���������\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:548
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "��������������� IDEA �� ����������, ��������� ���������� ������ ���\n"
 "%s ��������\n"
 
-#: g10/mainproc.c:581
+#: g10/mainproc.c:580
 msgid "decryption okay\n"
 msgstr "���������������� OK\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:584
 msgid "WARNING: message was not integrity protected\n"
 msgstr "�������������: ��� ������������� � ����������� ��� ��������\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:597
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "�������������: �� ��������������� ������ ���� ���������!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:603
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:624
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "��������: � ���������� ������ \"���-��-�����-���-����\"\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:626
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "������ ����� �������='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:711
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr ""
+
+#: g10/mainproc.c:839
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "���������� �������� - ��������������� \"gpg --import\" ��� ��������\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1187
 #, fuzzy
 msgid "no signature found\n"
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1430
 msgid "signature verification suppressed\n"
 msgstr "��������� ��������� ���������\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1539
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "�������� ��������� ����� ��� ��������� ���������\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1550
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1555
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "�������� ����� ��� %.*s �� ����� ��� ��������%s ID %08lX\n"
 
-#: g10/mainproc.c:1544
+#: g10/mainproc.c:1575
 msgid "Key available at: "
 msgstr "������ ��������� ���: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "������� �������� ��� \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr "[�������]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1797
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1895
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1900
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1903
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr "�������"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr "���������-��������"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 msgid "unknown"
 msgstr "�������"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "�������� ������� ��� ���������: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
 msgstr "��� ����� ���������� ��������\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:2037
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "�������������: ���������� ��������� ���������. ���� � ����� �� ��������.\n"
 
-#: g10/mainproc.c:2013
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���������� �������� ������ 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�������� ������ ���� (PGP 2.x)\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�� ������ ������(root) ������ ����������� ��� proc_tree()\n"
 
@@ -4952,16 +4961,16 @@ msgstr ""
 msgid "directory `%s' created\n"
 msgstr "%s: ��������� �������������\n"
 
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:143
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "�������� ��������� ��� ���������� �������� �������� %d\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:713
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "�������������: ������� �� ������� ��������������� ���������� ������\n"
 
-#: g10/parse-packet.c:1159
+#: g10/parse-packet.c:1164
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��������� ����� %d ���� �������� �� ������� bit\n"
@@ -5729,12 +5738,12 @@ msgstr ""
 "�������������: �������� ��� %%-�������� ��� url ��������� (���� ������).\n"
 "               ����� �� ������������.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:346
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:355
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s �������� ���: \"%s\"\n"
@@ -5757,12 +5766,12 @@ msgstr ""
 msgid "signing:"
 msgstr "��������:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1101
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ���������� ������ �� ������� ����� PGP 2.x �� ��������� --pgp2\n"
 
-#: g10/sign.c:1278
+#: g10/sign.c:1280
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s ������������� �� ��������������\n"
diff --git a/po/eo.po b/po/eo.po
index 8da95983d..35cfeb6b3 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: [email protected]\n"
-"POT-Creation-Date: 2006-12-04 15:05+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
 "Language-Team: Esperanto <[email protected]>\n"
@@ -40,10 +40,10 @@ msgstr "skribas sekretan �losilon al '%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
+#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -77,9 +77,9 @@ 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:481 g10/gpg.c:1008 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
+#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
+#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
@@ -391,15 +391,15 @@ msgstr "sekreta �losilo ne havebla"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
+#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "ne povas fari tion en neinteraga re�imo\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
+#: g10/keygen.c:1456
 msgid "Your selection? "
 msgstr "Via elekto? "
 
@@ -577,8 +577,8 @@ msgstr "   (%d) RSA (nur �ifri)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
+#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
@@ -602,7 +602,7 @@ msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 msgid "secret key already stored on a card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1319 g10/keyedit.c:1351
 msgid "quit this menu"
 msgstr "forlasi �i tiun menuon"
 
@@ -611,7 +611,7 @@ msgstr "forlasi �i tiun menuon"
 msgid "show admin commands"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1322 g10/keyedit.c:1354
 msgid "show this help"
 msgstr "montri �i tiun helpon"
 
@@ -668,7 +668,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1457 g10/keyedit.c:1617
 msgid "Command> "
 msgstr "Komando> "
 
@@ -687,7 +687,7 @@ msgstr "malkongruaj komandoj\n"
 msgid "Admin commands are not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1602 g10/keyedit.c:2238
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
@@ -745,7 +745,7 @@ msgstr "Ripetu pasfrazon: "
 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:3868 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 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,7 +755,7 @@ 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:3392 g10/keyserver.c:1705
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3386 g10/keyserver.c:1705
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -804,7 +804,7 @@ msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "uzu la opcion \"--delete-secret-key\" por forvi�i �in unue.\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:213 g10/sign.c:1286
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
@@ -870,12 +870,12 @@ msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s-�ifrita por: %s\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:292
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s-�ifritaj datenoj\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:296
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "�ifrita per nekonata metodo %d\n"
@@ -1014,7 +1014,7 @@ msgstr ""
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:379
 msgid ""
 "@Commands:\n"
 " "
@@ -1022,128 +1022,128 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: g10/gpg.c:380
+#: g10/gpg.c:381
 msgid "|[file]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:383
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "encrypt data"
 msgstr "�ifri datenojn"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "encryption only with symmetric cipher"
 msgstr "�ifri nur kun simetria �ifro"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "decrypt data (default)"
 msgstr "mal�ifri datenojn (implicita elekto)"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "list keys"
 msgstr "listigi �losilojn"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:394
 msgid "list keys and signatures"
 msgstr "listigi �losilojn kaj subskribojn"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "generate a new key pair"
 msgstr "krei novan �losilparon"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "remove keys from the public keyring"
 msgstr "forigi �losilojn de la publika �losilaro"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "remove keys from the secret keyring"
 msgstr "forigi �losilojn de la sekreta �losilaro"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:404
 msgid "sign or edit a key"
 msgstr "subskribi a� redakti �losilon"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:408
 msgid "export keys to a key server"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:409
 msgid "import keys from a key server"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "search for keys on a key server"
 msgstr "ser�i �losilojn �e �losilservilo"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:413
 msgid "update all keys from a keyserver"
 msgstr "aktualigi �iujn �losilojn de �losilservilo"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:417
 msgid "import/merge keys"
 msgstr "importi/kunfandi �losilojn"
 
-#: g10/gpg.c:419
+#: g10/gpg.c:420
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:421
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:422
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/gpg.c:437
+#: g10/gpg.c:438
 msgid "|algo [files]|print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/gpg.c:441 g10/gpgv.c:71
+#: g10/gpg.c:442 g10/gpgv.c:70
 msgid ""
 "@\n"
 "Options:\n"
@@ -1153,51 +1153,51 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/gpg.c:445
+#: g10/gpg.c:446
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "use this user-id to sign or decrypt"
 msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:458
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/gpg.c:462
+#: g10/gpg.c:463
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:477
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: g10/gpg.c:478 g10/gpgv.c:73
+#: g10/gpg.c:479 g10/gpgv.c:72
 msgid "verbose"
 msgstr "detala eligo"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:491
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:531
+#: g10/gpg.c:532
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:532
+#: g10/gpg.c:533
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1205,7 +1205,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
 
-#: g10/gpg.c:564
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1225,15 +1225,15 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/gpg.c:763 g10/gpgv.c:98
+#: g10/gpg.c:766 g10/gpgv.c:97
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:783
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1243,7 +1243,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/gpg.c:794
+#: g10/gpg.c:797
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1251,584 +1251,589 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:803 g10/keyedit.c:2310
+#: g10/gpg.c:806 g10/keyedit.c:2304
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:809
+#: g10/gpg.c:812
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:815 g10/keyedit.c:2356
+#: g10/gpg.c:818 g10/keyedit.c:2350
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
 
-#: g10/gpg.c:898
+#: g10/gpg.c:901
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/gpg.c:1046
+#: g10/gpg.c:1049
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1067
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, 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:1291
+#: g10/gpg.c:1294
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1300
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, 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:1303
+#: g10/gpg.c:1306
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1444
+#: g10/gpg.c:1447
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "montri, en kiu �losilaro estas listigita �losilo"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1954
+#: g10/gpg.c:1957
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/gpg.c:1996
+#: g10/gpg.c:1999
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/gpg.c:2000
+#: g10/gpg.c:2003
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: g10/gpg.c:2007
+#: g10/gpg.c:2010
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/gpg.c:2236
+#: g10/gpg.c:2239
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2402 g10/gpg.c:2414
+#: g10/gpg.c:2405 g10/gpg.c:2417
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2494
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "%s ne estas valida signaro\n"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2768
+#: g10/gpg.c:2773
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2771
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/gpg.c:2858
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2875
 #, 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:2880
+#: g10/gpg.c:2890
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/gpg.c:2894
+#: g10/gpg.c:2904
 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:2900
+#: g10/gpg.c:2910
 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:2906
+#: g10/gpg.c:2916
 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:2919
+#: g10/gpg.c:2929
 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:2986 g10/gpg.c:3010
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:2992 g10/gpg.c:3016
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:2998
+#: g10/gpg.c:3008
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3004
+#: g10/gpg.c:3014
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3029
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3031
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3033
 #, 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:3025
+#: g10/gpg.c:3035
 #, 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:3027
+#: g10/gpg.c:3037
 #, 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:3030
+#: g10/gpg.c:3040
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3044
 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:3041
+#: g10/gpg.c:3051
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3060
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3064
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3058
+#: g10/gpg.c:3068
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3091
+#: g10/gpg.c:3101
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3148
 #, 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:3143
+#: g10/gpg.c:3153
 #, 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:3148
+#: g10/gpg.c:3158
 #, 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:3250
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3271
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3291
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3314
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3306
+#: g10/gpg.c:3316
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3319
 #, 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:3327
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3365
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3367
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3370
 #, 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:3380
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/gpg.c:3426
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
 
-#: g10/gpg.c:3560
+#: g10/gpg.c:3570
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3572
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3564
+#: g10/gpg.c:3574
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3585
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3595
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3644
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:3854
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/gpg.c:3858
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4172
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4174
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4207
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@ -1853,45 +1858,45 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Nevalida �losilo %08lX validigita per --always-trust\n"
 
-#: g10/getkey.c:2380 g10/keyedit.c:3712
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, 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:2611
+#: g10/getkey.c:2614
 #, 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:2658
+#: g10/getkey.c:2661
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:73
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "�u forvi�i �i tiun �losilon de la �losilaro? "
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:76
 #, fuzzy
 msgid "make timestamp conflicts only a warning"
 msgstr "malkongruo de tempostampoj"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:77
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:101
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:104
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2410,7 +2415,7 @@ msgstr "�losilo %08lX: nova �losilo - ignorita\n"
 msgid "no writable keyring found: %s\n"
 msgstr "neniu skribebla �losilaro trovita: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skribas al '%s'\n"
@@ -2764,43 +2769,43 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
+#: g10/keyedit.c:890 g10/keyedit.c:1736
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
+#: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, fuzzy, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2811,7 +2816,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 #, fuzzy
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
@@ -2820,7 +2825,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2831,12 +2836,12 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 #, fuzzy
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�u vi volas, ke via subskribo eksvalidi�u je la sama tempo? (j/n) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2847,7 +2852,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 #, fuzzy
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
@@ -2856,53 +2861,53 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nenio por subskribi per �losilo %08lX\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "�i tiu �losilo eksvalidi�is!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:848
 #, fuzzy
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�u vi volas, ke via subskribo eksvalidi�u je la sama tempo? (j/n) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:883
 #, fuzzy
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "eblas subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:885
 #, fuzzy
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "�i tiu mesa�o povas ne esti uzebla de PGP 2.x\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:910
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2911,31 +2916,31 @@ msgstr ""
 "Kiom zorge vi kontrolis, ke la �losilo, kiun vi subskribos, vere apartenas\n"
 "al la supre nomita persono? Se vi ne scias la respondon, donu \"0\".\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Mi ne respondas.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Mi tute ne kontrolis.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Mi malzorge kontrolis.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Mi tre zorge kontrolis.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:927
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:951
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2944,98 +2949,98 @@ msgstr ""
 "�u vi estas tute certa, ke vi volas subskribi �i tiun �losilon\n"
 "per via �losilo: \""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:958
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel neeksportebla.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:972
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:982
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel neeksportebla.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:989
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Mi tute ne kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1001
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Mi malzorge kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1006
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Mi tre zorge kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1016
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
-#: g10/keyedit.c:5004 g10/sign.c:352
+#: g10/keyedit.c:1061 g10/keyedit.c:4793 g10/keyedit.c:4884 g10/keyedit.c:4948
+#: g10/keyedit.c:5009 g10/sign.c:351
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1126
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1137 g10/keygen.c:3215
 msgid "This key is not protected.\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1145 g10/keygen.c:3218
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1149 g10/keygen.c:3222
 msgid "Key is protected.\n"
 msgstr "�losilo estas protektita.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1173
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ne povas redakti �i tiun �losilon: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1179
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3043,11 +3048,11 @@ msgstr ""
 "Donu la novan pasfrazon por �i tiu sekreta �losilo.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1188 g10/keygen.c:1895
 msgid "passphrase not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1193
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3055,207 +3060,207 @@ msgstr ""
 "Vi ne deziras pasfrazon - tio ver�ajne estas *malbona* ideo!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1196
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "�u vi vere volas fari tion? "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1267
 msgid "moving a key signature to the correct place\n"
 msgstr "movas �losilsubskribon al la �usta loko\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1353
 msgid "save and quit"
 msgstr "skribi kaj fini"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1356
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1357
 msgid "list key and user IDs"
 msgstr "listigi �losilojn kaj uzantidentigilojn"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1359
 msgid "select user ID N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1360
 #, fuzzy
 msgid "select subkey N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1361
 #, fuzzy
 msgid "check signatures"
 msgstr "revoki subskribojn"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1366
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "subskribi la �losilon loke"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1379
 msgid "add a user ID"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1381
 msgid "add a photo ID"
 msgstr "aldoni foto-identigilon"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1383
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "forvi�i uzantidentigilon"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1388
 #, fuzzy
 msgid "add a subkey"
 msgstr "al"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1392
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1394
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1396
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "forvi�i flankan �losilon"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "add a revocation key"
 msgstr "aldoni flankan �losilon"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marku uzantidentigilon kiel �efan"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "de sekreta a� publika listo iri al la alia"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1413
 msgid "list preferences (expert)"
 msgstr "listigi preferojn (spertula)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1415
 msgid "list preferences (verbose)"
 msgstr "listigi preferojn (detale)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "�an�i la posedantofidon"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoki flankan �losilon"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "�alti �losilon"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "mal�alti �losilon"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "montri foto-identigilon"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1446
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1564
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "eraro dum legado de sekreta �losilbloko '%s': %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1582
 msgid "Secret key is available.\n"
 msgstr "Sekreta �losilo estas havebla.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1663
 msgid "Need the secret key to do this.\n"
 msgstr "Bezonas la sekretan �losilon por fari tion.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1671
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1690
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3263,266 +3268,266 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1730
 #, fuzzy
 msgid "Key is revoked."
 msgstr "�losilo estas revokita.\n"
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1749
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�u vere subskribi �iujn uzantidentigilojn? "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1756
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1765
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nekonata klaso de subskribo"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1788
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
 msgid "You must select at least one user ID.\n"
 msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1812
 msgid "You can't delete the last user ID!\n"
 msgstr "Vi ne povas forvi�i la lastan uzantidentigilon!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1814
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1815
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1865
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1877
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1905
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "eraro dum kreado de �losilaro '%s': %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1960
 msgid "You must select at least one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1963
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1964
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�u vi vere volas forvi�i �i tiun �losilon? "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:1999
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2000
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2018
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "�u vi vere volas revoki �i tiun �losilon? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2029
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�u vi vere volas revoki la elektitajn �losilojn? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�u vi vere volas revoki �i tiun �losilon? "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2081
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2123
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "agordi liston de preferoj"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "�u vere aktualigi la preferojn? "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2199
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�u skribi �an�ojn? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2202
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�u fini sen skribi �an�ojn? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2212
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2226
 msgid "Key not changed so no update needed.\n"
 msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2327
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2379
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2390
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2405 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2413 g10/keyedit.c:2414
 #, fuzzy
 msgid "Notations: "
 msgstr "Notacio: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2624
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2683
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "�i tiu �losilo estas revokebla per %s �losilo %s%s\n"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2704
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "�i tiu �losilo estas revokebla per %s �losilo %s%s\n"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2710
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sentema)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keyedit.c:2726 g10/keyedit.c:2782 g10/keyedit.c:2843 g10/keyedit.c:2858
 #: g10/keylist.c:194 g10/keyserver.c:511
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2729 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "rev"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2731 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2733 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2735
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2754
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2761
 msgid "This key has been disabled"
 msgstr "�i tiu �losilo estas mal�altita"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2789 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2813
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "rev"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "eksval"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2944
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3005
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3531,75 +3536,75 @@ msgstr ""
 "AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
 "        ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3351
+#: g10/keyedit.c:3010 g10/keyedit.c:3345
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas aldoni �in? (j/n) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3016
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila �losilo.\n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3156
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3166
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3170
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3176
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3190
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forvi�is %d subskribon.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3191
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forvi�is %d subskribojn.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3194
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3227 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "nevalida"
 
-#: g10/keyedit.c:3235
+#: g10/keyedit.c:3229
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3242
+#: g10/keyedit.c:3236
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3237
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3246
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3340
 #, fuzzy
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
@@ -3609,375 +3614,375 @@ msgstr ""
 "AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
 "        ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3351
 #, fuzzy
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila �losilo.\n"
 
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3371
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Donu la �losilgrandon"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3396
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3417
+#: g10/keyedit.c:3411
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3439
+#: g10/keyedit.c:3433
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3452
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3464
+#: g10/keyedit.c:3458
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:3525
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
 
-#: g10/keyedit.c:3531
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:3538
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�an�as la daton de eksvalidi�o de la �efa �losilo.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3582
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3598
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3678
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3679
+#: g10/keyedit.c:3684
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3841
+#: g10/keyedit.c:3846
 msgid "Please select exactly one user ID.\n"
 msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
+#: g10/keyedit.c:3885 g10/keyedit.c:3995 g10/keyedit.c:4115 g10/keyedit.c:4256
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/keyedit.c:4051
+#: g10/keyedit.c:4056
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4131
+#: g10/keyedit.c:4136
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:4132
+#: g10/keyedit.c:4137
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4199
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4348
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "�u surskribi (j/N)? "
 
-#: g10/keyedit.c:4407
+#: g10/keyedit.c:4412
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4470
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4492
+#: g10/keyedit.c:4497
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4627
+#: g10/keyedit.c:4632
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4635 g10/keyedit.c:4699 g10/keyedit.c:4742
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   subskribita per %08lX je %s%s\n"
 
-#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4641
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:4640
+#: g10/keyedit.c:4645
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas aldoni �in? (j/n) "
 
-#: g10/keyedit.c:4644
+#: g10/keyedit.c:4649
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/keyedit.c:4671
+#: g10/keyedit.c:4676
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:4697
+#: g10/keyedit.c:4702
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "subskribi �losilon nerevokeble"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4709
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4731
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:4746
+#: g10/keyedit.c:4751
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�u vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4781
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
-#: g10/keyedit.c:4846
+#: g10/keyedit.c:4851
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4863
+#: g10/keyedit.c:4868
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4927
+#: g10/keyedit.c:4932
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4989
+#: g10/keyedit.c:4994
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:5084
+#: g10/keyedit.c:5089
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "prefero %c%lu ripetita\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:876
 #, fuzzy
 msgid "writing direct signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:915
 msgid "writing self signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:965
 msgid "writing key binding signature\n"
 msgstr "skribas �losilbindan subskribon\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
+#: g10/keygen.c:2776
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�losilgrando nevalida; uzas %u bitojn\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "�losilgrando rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1331
 #, fuzzy
 msgid "Sign"
 msgstr "subskribi"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1334
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1337
 #, fuzzy
 msgid "Encrypt"
 msgstr "�ifri datenojn"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1340
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1348
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1367
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1371
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1376
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1379
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (nur �ifri)\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1382
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1385
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1441
 msgid "Please select what kind of key you want:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1443
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur subskribi)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur �ifri)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur subskribi)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1453
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1522
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-�losilparo havos 1024 bitojn.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1532
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1539
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Kiun �losilgrandon vi deziras? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1553
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1559
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Petita �losilgrando estas %u bitoj\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1564 g10/keygen.c:1569
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1618
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3993,7 +3998,7 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1629
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4009,40 +4014,40 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Key is valid for? (0) "
 msgstr "�losilo validu ...? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "�losilo validu por ...? (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1673
 msgid "invalid value\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1680
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1686
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s eksvalidi�os je %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1687
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1693
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4050,12 +4055,12 @@ msgstr ""
 "Via sistemo ne povas montri datojn post 2038.\n"
 "Tamen, �i estos �uste traktata �is 2106.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1698
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�u tio estas �usta (j/n)? "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1713
 #, fuzzy
 msgid ""
 "\n"
@@ -4071,44 +4076,44 @@ msgstr ""
 "    \"Heinrich Heine (la poeto) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1726
 msgid "Real name: "
 msgstr "Vera nomo: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Invalid character in name\n"
 msgstr "Nevalida signo en nomo\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name may not start with a digit\n"
 msgstr "Nomo ne povas komenci�i per cifero\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1738
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nomo devas havi almena� 5 signojn\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1746
 msgid "Email address: "
 msgstr "Retadreso: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1752
 msgid "Not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1760
 msgid "Comment: "
 msgstr "Komento: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1766
 msgid "Invalid character in comment\n"
 msgstr "Nevalida signo en komento\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1789
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vi uzas la signaron '%s'.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1795
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4119,7 +4124,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1800
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Bonvolu ne meti la retadreson en la veran nomon a� la komenton\n"
 
@@ -4134,23 +4139,23 @@ msgstr "Bonvolu ne meti la retadreson en la veran nomon a� la komenton\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 msgid "NnCcEeOoQq"
 msgstr "NnKkAaBbFf"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1826
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (F)ini? "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (B)one/(F)ini? "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:1846
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1886
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4158,12 +4163,12 @@ msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:1896 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1902
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4175,7 +4180,7 @@ msgstr ""
 "uzante �i tiun programon kun la opcio \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:1924
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4187,50 +4192,50 @@ msgstr ""
 "kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
 "akiri sufi�e da entropio.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2722
 msgid "Key generation canceled.\n"
 msgstr "Kreado de �losiloj nuligita.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:2921 g10/keygen.c:3068
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:2923 g10/keygen.c:3071
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:2926 g10/keygen.c:3074
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3057
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "neniu skribebla publika �losilaro trovita: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3063
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "neniu skribebla sekreta �losilaro trovita: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3081
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eraro dum skribado de publika �losilaro '%s': %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3088
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3111
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3122
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4239,12 +4244,12 @@ msgstr ""
 "Notu, ke �i tiu �losilo ne estas uzebla por �ifrado. Vi eble volos\n"
 "uzi la komandon \"--edit-key\" por krei flankan �losilon por tiu celo.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4252,7 +4257,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4260,26 +4265,26 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3197 g10/keygen.c:3326
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTO: krei sub�losilojn por v3-�losiloj ne estas OpenPGP-kongrue\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3236 g10/keygen.c:3359
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�u vere krei? "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3524
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3571
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3597
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
@@ -4570,212 +4575,216 @@ msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:239
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s-�ifritaj datenoj\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:300
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "�ifrita per nekonata metodo %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:381
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "publika �losilo estas %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:438
 msgid "public key encrypted data: good DEK\n"
 msgstr "publik�losile �ifritaj datenoj: bona DEK\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:471
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:475 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:479
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "�ifrita per %s-�losilo, %08lX\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:493
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "publik�losila mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:507
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:509
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:540 g10/mainproc.c:562
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supozas %s �ifritajn datenojn\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:548
 #, 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:581
+#: g10/mainproc.c:580
 msgid "decryption okay\n"
 msgstr "mal�ifrado sukcesis\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:584
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:597
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTO: �ifrita mesa�o estis manipulita!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:603
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:624
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:626
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originala dosiernomo='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:711
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr ""
+
+#: g10/mainproc.c:839
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "memstara revoko - uzu \"gpg --import\" por apliki �in\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1187
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1430
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas mal�altita\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1539
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "ne povas trakti �i tiujn pluroblajn subskribojn\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1550
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1555
 #, 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:1544
+#: g10/mainproc.c:1575
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenia helpo disponata"
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Eksvalidi�inta subskribo de \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr "[malcerta]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1797
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1895
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1900
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1903
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1904
 #, fuzzy
 msgid "binary"
 msgstr "�efa"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "nekonata versio"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
 msgstr "ne aparta subskribo\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:2037
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2013
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nevalida radikpaketo trovita en proc_tree()\n"
 
@@ -4911,16 +4920,16 @@ msgstr ""
 msgid "directory `%s' created\n"
 msgstr "%s: dosierujo kreita\n"
 
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:143
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "ne povas trakti publik�losilan metodon %d\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:713
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1159
+#: g10/parse-packet.c:1164
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
@@ -5669,12 +5678,12 @@ msgstr ""
 "AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
 "kompletigo.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:346
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:355
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s-subskribo de: %s\n"
@@ -5694,12 +5703,12 @@ msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 msgid "signing:"
 msgstr "subskribas:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1101
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "eblas klartekste subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
 
-#: g10/sign.c:1278
+#: g10/sign.c:1280
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s �ifrado estos aplikata\n"
diff --git a/po/es.po b/po/es.po
index 68c5d0e09..a7e3c1b38 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: [email protected]\n"
-"POT-Creation-Date: 2006-12-04 15:05+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2005-03-25 16:50+0100\n"
 "Last-Translator: Jaime Su�rez <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -44,10 +44,10 @@ msgstr "escribiendo clave privada en `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
+#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -86,9 +86,9 @@ 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:481 g10/gpg.c:1008 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
+#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
+#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no se puede crear %s: %s\n"
@@ -399,14 +399,14 @@ msgstr "tarjeta OpenPGP no disponible: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "tarjeta OpenPGP num. %s detectada\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
+#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
+#: g10/keygen.c:1456
 msgid "Your selection? "
 msgstr "Su elecci�n: "
 
@@ -574,8 +574,8 @@ msgstr "   (2) Clave de cifrado\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Clave de autentificaci�n\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
+#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Elecci�n inv�lida.\n"
 
@@ -595,7 +595,7 @@ msgstr "las partes secretas de la clave no est�n disponibles\n"
 msgid "secret key already stored on a card\n"
 msgstr "clave secreta ya almacenada en una tarjeta\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1319 g10/keyedit.c:1351
 msgid "quit this menu"
 msgstr "sale de este men�"
 
@@ -603,7 +603,7 @@ msgstr "sale de este men�"
 msgid "show admin commands"
 msgstr "ver �rdenes de administrador"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1322 g10/keyedit.c:1354
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
@@ -655,7 +655,7 @@ msgstr "men� para cambiar o desbloquear el PIN"
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1457 g10/keyedit.c:1617
 msgid "Command> "
 msgstr "Orden> "
 
@@ -671,7 +671,7 @@ msgstr "Se permiten �rdenes de administrador\n"
 msgid "Admin commands are not allowed\n"
 msgstr "No se permiten �rdenes de administrador\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1602 g10/keyedit.c:2238
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inv�lida (pruebe \"help\")\n"
 
@@ -726,7 +726,7 @@ msgstr "Repita este PIN: "
 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:3868 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -736,7 +736,7 @@ 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:3392 g10/keyserver.c:1705
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3386 g10/keyserver.c:1705
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -782,7 +782,7 @@ msgstr "�hay una clave secreta para esta clave p�blica! \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use antes la opci�n \"--delete-secret-key\" para borrarla.\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:213 g10/sign.c:1286
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
@@ -855,12 +855,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:91 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:292
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados %s\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:296
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado con algoritmo desconocido %d\n"
@@ -1004,7 +1004,7 @@ msgstr "ATENCI�N: no se ha exportado nada\n"
 # 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:378
+#: g10/gpg.c:379
 msgid ""
 "@Commands:\n"
 " "
@@ -1012,127 +1012,127 @@ msgstr ""
 "@�rdenes:\n"
 " "
 
-#: g10/gpg.c:380
+#: g10/gpg.c:381
 msgid "|[file]|make a signature"
 msgstr "|[file]|crea una firma"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|crea una firma en texto claro"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:383
 msgid "make a detached signature"
 msgstr "crea una firma separada"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:394
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "list and check key signatures"
 msgstr "lista y comprueba firmas de las claves"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "remove keys from the public keyring"
 msgstr "elimina claves del anillo p�blico"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "remove keys from the secret keyring"
 msgstr "elimina claves del anillo privado"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:404
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocaci�n"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:408
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:409
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "search for keys on a key server"
 msgstr "busca claves en un servidor de claves"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:413
 msgid "update all keys from a keyserver"
 msgstr "actualiza todas las claves desde un servidor de claves"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:417
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/gpg.c:419
+#: g10/gpg.c:420
 msgid "print the card status"
 msgstr "escribir estado de la tarjeta"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:421
 msgid "change data on a card"
 msgstr "cambiar datos en la tarjeta"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:422
 msgid "change a card's PIN"
 msgstr "cambiar el PIN de la tarjeta"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/gpg.c:437
+#: g10/gpg.c:438
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
-#: g10/gpg.c:441 g10/gpgv.c:71
+#: g10/gpg.c:442 g10/gpgv.c:70
 msgid ""
 "@\n"
 "Options:\n"
@@ -1142,47 +1142,47 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/gpg.c:445
+#: g10/gpg.c:446
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:458
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresi�n N (0 no comprime)"
 
-#: g10/gpg.c:462
+#: g10/gpg.c:463
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:477
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/gpg.c:478 g10/gpgv.c:73
+#: g10/gpg.c:479 g10/gpgv.c:72
 msgid "verbose"
 msgstr "prolijo"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:491
 msgid "prompt before overwriting"
 msgstr "preguntar antes de sobreescribir"
 
-#: g10/gpg.c:531
+#: g10/gpg.c:532
 msgid "use strict OpenPGP behavior"
 msgstr "usar estilo OpenPGP estricto"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:533
 msgid "generate PGP 2.x compatible messages"
 msgstr "generar mensajes compatibles con PGP 2.x"
 
@@ -1190,7 +1190,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:561
+#: g10/gpg.c:562
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1198,7 +1198,7 @@ msgstr ""
 "@\n"
 "(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
 
-#: g10/gpg.c:564
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1218,15 +1218,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/gpg.c:763 g10/gpgv.c:98
+#: g10/gpg.c:766 g10/gpgv.c:97
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:783
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1236,7 +1236,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: g10/gpg.c:794
+#: g10/gpg.c:797
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1244,71 +1244,71 @@ msgstr ""
 "\n"
 "Algoritmos disponibles:\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid "Pubkey: "
 msgstr "Clave p�blica: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2310
+#: g10/gpg.c:806 g10/keyedit.c:2304
 msgid "Cipher: "
 msgstr "Cifrado: "
 
-#: g10/gpg.c:809
+#: g10/gpg.c:812
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2356
+#: g10/gpg.c:818 g10/keyedit.c:2350
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/gpg.c:898
+#: g10/gpg.c:901
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/gpg.c:1046
+#: g10/gpg.c:1049
 msgid "conflicting commands\n"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1067
 #, 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:1261
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedad insegura del directorio personal `%s'\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, 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:1267
+#: g10/gpg.c:1270
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedad insegura de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1276
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros del directorio personal `%s'\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, 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:1279
+#: g10/gpg.c:1282
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1288
 #, 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:1288
+#: g10/gpg.c:1291
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1316,18 +1316,18 @@ msgstr ""
 "AVISO: propiedad insegura del directorio contenedor del fichero de\n"
 "configuraci�n `%s'\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, 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:1297
+#: g10/gpg.c:1300
 #, 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:1300
+#: g10/gpg.c:1303
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1335,465 +1335,470 @@ msgstr ""
 "AVISO: permisos inseguros del directorio contenedor del fichero de\n"
 "configuraci�n `%s'\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, 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:1444
+#: g10/gpg.c:1447
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "art�culo de configuraci�n desconocido `%s'\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 #, 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:1551
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "muestra en qu� anillos est� una clave"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/gpg.c:1954
+#: g10/gpg.c:1957
 #, 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:1996
+#: g10/gpg.c:1999
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/gpg.c:2000
+#: g10/gpg.c:2003
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/gpg.c:2007
+#: g10/gpg.c:2010
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/gpg.c:2236
+#: g10/gpg.c:2239
 #, 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:2402 g10/gpg.c:2414
+#: g10/gpg.c:2405 g10/gpg.c:2417
 #, 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:2491
+#: g10/gpg.c:2494
 #, 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:2515 g10/gpg.c:2702 g10/keyedit.c:4069
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 msgid "invalid keyserver options\n"
 msgstr "opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 msgid "invalid list options\n"
 msgstr "lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, 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:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "`%s' no es un juego de caracteres v�lido\n"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2603
 msgid "invalid verify options\n"
 msgstr "opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/gpg.c:2768
+#: g10/gpg.c:2773
 #, 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:2771
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/gpg.c:2858
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2875
 #, 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:2880
+#: g10/gpg.c:2890
 #, 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:2894
+#: g10/gpg.c:2904
 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:2900
+#: g10/gpg.c:2910
 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:2906
+#: g10/gpg.c:2916
 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:2919
+#: g10/gpg.c:2929
 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:2986 g10/gpg.c:3010
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/gpg.c:2992 g10/gpg.c:3016
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/gpg.c:2998
+#: g10/gpg.c:3008
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de compresi�n seleccionado es inv�lido\n"
 
-#: g10/gpg.c:3004
+#: g10/gpg.c:3014
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3029
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3031
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3033
 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:3025
+#: g10/gpg.c:3035
 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:3027
+#: g10/gpg.c:3037
 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:3030
+#: g10/gpg.c:3040
 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:3034
+#: g10/gpg.c:3044
 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:3041
+#: g10/gpg.c:3051
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inv�lidas\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3060
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inv�lidas\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3064
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
 
-#: g10/gpg.c:3058
+#: g10/gpg.c:3068
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresi�n inv�lidas\n"
 
-#: g10/gpg.c:3091
+#: g10/gpg.c:3101
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s a�n no funciona con %s\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3148
 #, 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:3143
+#: g10/gpg.c:3153
 #, 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:3148
+#: g10/gpg.c:3158
 #, 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:3250
+#: g10/gpg.c:3260
 #, 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:3261
+#: g10/gpg.c:3271
 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:3272
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3291
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "el cifrado sim�trico de `%s' fall�: %s\n"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3314
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3306
+#: g10/gpg.c:3316
 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:3309
+#: g10/gpg.c:3319
 #, 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:3327
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3365
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3367
 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:3360
+#: g10/gpg.c:3370
 #, 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:3380
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/gpg.c:3426
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/gpg.c:3560
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "env�o al servidor de claves fallido: %s\n"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3572
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepci�n del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3564
+#: g10/gpg.c:3574
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportaci�n de clave fallida: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3585
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "b�squeda del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3595
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovaci�n al servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3644
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: g10/gpg.c:3854
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -1801,19 +1806,19 @@ 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:3858
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4172
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de pol�tica de certificado inv�lida\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4174
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4207
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
@@ -1836,26 +1841,26 @@ msgstr ""
 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:2380 g10/keyedit.c:3712
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, 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:2611
+#: g10/getkey.c:2614
 #, 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:2658
+#: g10/getkey.c:2661
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "clave %s: clave secreta sin clave p�blica - omitida\n"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:73
 msgid "be somewhat more quiet"
 msgstr "algo m�s discreto"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "take the keys from this keyring"
 msgstr "tomar las claves de este anillo"
 
@@ -1863,19 +1868,19 @@ msgstr "tomar las claves de este anillo"
 # Creo que es mejor "con el sello de fecha", no es un conflicto
 # del sello en si mismo sino en relaci�n con el mensaje.
 # Ok.
-#: g10/gpgv.c:77
+#: g10/gpgv.c:76
 msgid "make timestamp conflicts only a warning"
 msgstr "hacer que los conflictos de fecha-hora sean s�lo un aviso"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:77
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe informaci�n de estado en este descriptor de fichero"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:101
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:104
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2414,7 +2419,7 @@ msgstr "clave %s: clave nueva - omitida\n"
 msgid "no writable keyring found: %s\n"
 msgstr "anillo de claves no escribible encontrado: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
@@ -2770,42 +2775,42 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "Introduzca un dominio para restringir esta firma, o intro para nada.\n"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
+#: g10/keyedit.c:890 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Seguro que todav�a quiere firmarlo? (s/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
+#: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  Imposible firmar.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "ID de usuario \"%s\" expirado."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID de usuario \"%s\" no tiene autofirma."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID de usuario \"%s\" no tiene autofirma."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "�Firmar de verdad? (s/N) "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2814,11 +2819,11 @@ msgstr ""
 "La autofirma en \"%s\"\n"
 "es una firma de tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Quiere convertirla en una autofirma OpenPGP? (s/N) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2827,11 +2832,11 @@ msgstr ""
 "Su firma actual en \"%s\"\n"
 "ha expirado.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�Quiere producir una nueva firma que reemplace a la expirada? (s/N) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2840,43 +2845,43 @@ msgstr ""
 "Su firma actual en \"%s\"\n"
 "es una firma local.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Quiere convertirla en una clave totalmente exportable? (s/N) "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" ya estaba firmada localmente por la clave %s\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" ya estaba firmada por la clave %s\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "�Quiere firmarlo a�n as�? (s/N) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada que firmar con la clave %s\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "�Esta clave ha caducado!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta clave expirar� el %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�Quiere que su firma caduque al mismo tiempo? (S/n) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:883
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2884,11 +2889,11 @@ msgstr ""
 "No puede hacer una firma OpenPGP de una clave PGP 2.x estando en modo --"
 "pgp2.\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:885
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Esto inutilizar�a la clave en PGP 2.x.\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:910
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2898,31 +2903,31 @@ msgstr ""
 "firmar pertenece realmente a la persona arriba nombrada? Si no sabe que\n"
 "contestar, introduzca \"0\".\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) No contesto.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) No lo he comprobado en absoluto.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) He hecho una comprobaci�n informal.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Lo he comprobado meticulosamente.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:927
 msgid "Your selection? (enter `?' for more information): "
 msgstr "�Su elecci�n? (escriba '?' si desea m�s informaci�n): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:951
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2931,76 +2936,76 @@ msgstr ""
 "�Est� realmente seguro de querer firmar esta clave\n"
 "con su clave: \"%s\" (%s)?\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:958
 msgid "This will be a self-signature.\n"
 msgstr "Esto ser� una autofirma.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:964
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "ATENCION: la firma no se marcar� como no exportable.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:972
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "AVISO: la firma no se marcar� como no revocable.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:982
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "La firma se marcar� como no exportable.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:989
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "La firma se marcar� como no revocable.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:996
 msgid "I have not checked this key at all.\n"
 msgstr "No he comprobado esta clave en absoluto.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1001
 msgid "I have checked this key casually.\n"
 msgstr "He comprobado esta clave informalmente.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1006
 msgid "I have checked this key very carefully.\n"
 msgstr "He comprobado esta clave meticulosamente.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1016
 msgid "Really sign? (y/N) "
 msgstr "�Firmar de verdad? (s/N) "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
-#: g10/keyedit.c:5004 g10/sign.c:352
+#: g10/keyedit.c:1061 g10/keyedit.c:4793 g10/keyedit.c:4884 g10/keyedit.c:4948
+#: g10/keyedit.c:5009 g10/sign.c:351
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1126
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "La clave tiene s�lo un apuntador u objetos de clave en la propia tarjeta\n"
 "- no hay frase contrase�a que cambiar.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1137 g10/keygen.c:3215
 msgid "This key is not protected.\n"
 msgstr "Esta clave no est� protegida.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Las partes secretas de la clave primaria no est�n disponibles.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1145 g10/keygen.c:3218
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Las partes secretas de la clave primaria se guardan en la tarjeta.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1149 g10/keygen.c:3222
 msgid "Key is protected.\n"
 msgstr "La clave est� protegida.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1173
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No puede editarse esta clave: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1179
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3008,11 +3013,11 @@ msgstr ""
 "Introduzca la nueva frase contrase�a para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1188 g10/keygen.c:1895
 msgid "passphrase not correctly repeated; try again"
 msgstr "frase contrase�a repetida incorrectamente; int�ntelo de nuevo"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1193
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3020,187 +3025,187 @@ msgstr ""
 "No ha especificado frase contrase�a. Esto es probablemente una *mala* idea.\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1196
 msgid "Do you really want to do this? (y/N) "
 msgstr "�Realmente quiere hacer esto? (s/N) "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1267
 msgid "moving a key signature to the correct place\n"
 msgstr "moviendo la firma de la clave al lugar correcto\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1353
 msgid "save and quit"
 msgstr "graba y sale"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1356
 msgid "show key fingerprint"
 msgstr "muestra huella dactilar de la clave"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1357
 msgid "list key and user IDs"
 msgstr "lista clave e identificadores de usuario"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1359
 msgid "select user ID N"
 msgstr "selecciona identificador de usuario N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1360
 msgid "select subkey N"
 msgstr "selecciona subclave N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1361
 msgid "check signatures"
 msgstr "comprueba firmas"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1366
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "firmar IDs seleccionadas [* ver debajo �rdenes relacionadas]"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs locally"
 msgstr "firma localmente los IDs de usuarios elegidos"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a trust signature"
 msgstr "firmar IDs seleccionados con firma de confianza"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "firmar IDs seleccionados con firma no revocable"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1379
 msgid "add a user ID"
 msgstr "a�adir un identificador de usuario"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1381
 msgid "add a photo ID"
 msgstr "a�adir un ID fotogr�fico"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1383
 msgid "delete selected user IDs"
 msgstr "borrar identificadores de usuario seleccionados"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1388
 msgid "add a subkey"
 msgstr "a�adir una subclave"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1392
 msgid "add a key to a smartcard"
 msgstr "a�adir clave a tarjeta"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1394
 msgid "move a key to a smartcard"
 msgstr "mover una clave a la tarjeta"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1396
 msgid "move a backup key to a smartcard"
 msgstr "mover una clave de respaldo a la tarjeta"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1400
 msgid "delete selected subkeys"
 msgstr "borrar clave secundaria"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1402
 msgid "add a revocation key"
 msgstr "a�adir una clave de revocaci�n"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1404
 msgid "delete signatures from the selected user IDs"
 msgstr "borrar firmas de los ID seleccionados"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1406
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "cambiar la fecha de caducidad para la clave o subclaves seleccionadas"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1408
 msgid "flag the selected user ID as primary"
 msgstr "marcar ID de usuario seleccionado como primario"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1410
 msgid "toggle between the secret and public key listings"
 msgstr "cambiar entre lista de claves secretas y p�blicas"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1413
 msgid "list preferences (expert)"
 msgstr "mostrar preferencias (experto)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1415
 msgid "list preferences (verbose)"
 msgstr "mostrar preferencias (prolijo)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1417
 msgid "set preference list for the selected user IDs"
 msgstr "establecer preferencias para todos los ID seleccionados"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "establecer URL del servidor de claves preferido por los IDs seleccionados"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "establecer preferencias para todos los ID seleccionados"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "cambia la frase contrase�a"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "cambia valores de confianza"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1432
 msgid "revoke signatures on the selected user IDs"
 msgstr "revocar firmas de los identificadores seleccionados"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1434
 msgid "revoke selected user IDs"
 msgstr "revocar los identificadores seleccionados"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1439
 msgid "revoke key or selected subkeys"
 msgstr "revoca clave o subclaves seleccionadas"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1440
 msgid "enable key"
 msgstr "habilita clave"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1441
 msgid "disable key"
 msgstr "deshabilita clave"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1442
 msgid "show selected photo IDs"
 msgstr "mostrar fotos de los ID seleccionados"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1446
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1564
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "error leyendo bloque de clave secreta \"%s\": %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1582
 msgid "Secret key is available.\n"
 msgstr "Clave secreta disponible.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1663
 msgid "Need the secret key to do this.\n"
 msgstr "Se necesita la clave secreta para hacer esto.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1671
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor use la orden \"cambia\" primero.\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1690
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3211,226 +3216,226 @@ msgstr ""
 "locales (lsign), una 't' para firmas fiables (tsign), `nr' para firmas no\n"
 "revocables (nrsign) o cualquier combinaci�n de ellas (ltsign, tnrsign, etc)\n"
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1730
 msgid "Key is revoked."
 msgstr "La clave est� revocada."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1749
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�Firmar realmente todos los IDs de usuario? (s/N) "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1756
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugerencia: seleccione los identificadores de usuario que firmar\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1765
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Clase de firma desconocida `%s'\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1788
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Esta orden no se permite en modo %s.\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1812
 msgid "You can't delete the last user ID!\n"
 msgstr "�No puede borrar el �ltimo identificador de usuario!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1814
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�Borrar realmente todos los identificadores seleccionados? (s/N) "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1815
 msgid "Really remove this user ID? (y/N) "
 msgstr "�Borrar realmente este identificador de usuario? (s/N) "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1865
 msgid "Really move the primary key? (y/N) "
 msgstr "�Borrar realmente la clave primaria? (s/N)"
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1877
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar exactamente una clave.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1905
 msgid "Command expects a filename argument\n"
 msgstr "La orden espera un nombre de fichero como argumento\n"
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1919
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "No se puede abrir `%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1936
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Error leyendo clave de respaldo desde `%s': %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1960
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1963
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�De verdad quiere borrar las claves seleccionadas? (s/N) "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1964
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�De verdad quiere borrar esta clave? (s/N) "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:1999
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�Revocar realmente todos los identificadores seleccionados? (s/N) "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2000
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�Revocar realmente este identificador de usuario? (s/N) "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2018
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "�De verdad quiere revocar la clave completa? (s/N) "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2029
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�De verdad quiere revocar las subclaves seleccionadas? (s/N)"
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2031
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�De verdad quiere revocar esta subclave? (s/N) "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2081
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "La confianza del propietario no puede establecerse si se est� usando\n"
 "una base de datos de confianza propocionada por el usuario\n"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2123
 msgid "Set preference list to:\n"
 msgstr "Establecer lista de preferencias a:\n"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2129
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "�Actualizar realmente las preferencias para los ID seleccionados? (s/N) "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2131
 msgid "Really update the preferences? (y/N) "
 msgstr "�Actualizar realmente las preferencias? (s/N) "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2199
 msgid "Save changes? (y/N) "
 msgstr "�Grabar cambios? (s/N) "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2202
 msgid "Quit without saving? (y/N) "
 msgstr "�Salir sin grabar? (s/N) "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2212
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2226
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2327
 msgid "Digest: "
 msgstr "Resumen: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2379
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2390
 msgid "Keyserver no-modify"
 msgstr "Sevidor de claves no-modificar"
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2405 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Servidor de claves preferido: "
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2413 g10/keyedit.c:2414
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaci�n: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2624
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "No hay preferencias en un identificador de usuario estilo PGP 2.x\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2683
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Esta clave fue revocada en %s por %s clave %s\n"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2704
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta clave puede ser revocada por %s clave %s"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2710
 msgid "(sensitive)"
 msgstr "(confidencial)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keyedit.c:2726 g10/keyedit.c:2782 g10/keyedit.c:2843 g10/keyedit.c:2858
 #: g10/keylist.c:194 g10/keyserver.c:511
 #, c-format
 msgid "created: %s"
 msgstr "creado: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2729 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
 #, c-format
 msgid "revoked: %s"
 msgstr "revocada: %s"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2731 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "caduc�: %s"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2733 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
 #, c-format
 msgid "expires: %s"
 msgstr "caduca: %s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2735
 #, c-format
 msgid "usage: %s"
 msgstr "uso: %s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2750
 #, c-format
 msgid "trust: %s"
 msgstr "confianza: %s"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2754
 #, c-format
 msgid "validity: %s"
 msgstr "validez: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2761
 msgid "This key has been disabled"
 msgstr "Esta clave est� deshabilitada"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2789 g10/keylist.c:200
 msgid "card-no: "
 msgstr "num. tarjeta: "
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2813
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3438,17 +3443,17 @@ 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:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "revocada"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "caducada"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2944
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3456,7 +3461,7 @@ msgstr ""
 "AVISO: ning�n ID de usuario est� marcado como principal. Esta orden puede\n"
 "       causar que se tome como principal por defecto otro ID de usuario.\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3005
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3465,75 +3470,75 @@ msgstr ""
 "AVISO: esta es una clave de tipo PGP2. A�adir un ID fotogr�fico puede\n"
 "hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3351
+#: g10/keyedit.c:3010 g10/keyedit.c:3345
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de querer a�adirla? (s/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3016
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "No puede a�adir un ID fotogr�fico a una clave tipo PGP2.\n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3156
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3166
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta firma inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3170
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3176
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3190
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3191
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3194
 msgid "Nothing deleted.\n"
 msgstr "No se borr� nada\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3227 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "Armadura no v�lida"
 
-#: g10/keyedit.c:3235
+#: g10/keyedit.c:3229
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:3242
+#: g10/keyedit.c:3236
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3237
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3246
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3340
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3542,359 +3547,359 @@ msgstr ""
 "AVISO: esta es una clave tipo PGP2. A�adir un revocador designado puede\n"
 "       hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3351
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "No puede a�adir un revocador designado a una clave tipo PGP2.\n"
 
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3371
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduzca el ID de usuario del revocador designado: "
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3396
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n"
 
-#: g10/keyedit.c:3417
+#: g10/keyedit.c:3411
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "no puede elegir una clave como su propio revocador designado\n"
 
-#: g10/keyedit.c:3439
+#: g10/keyedit.c:3433
 msgid "this key has already been designated as a revoker\n"
 msgstr "esta clave ya ha sido designada como revocadora\n"
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3452
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "�AVISO: no podr� deshacer la elecci�n de clave como revocador designado!\n"
 
-#: g10/keyedit.c:3464
+#: g10/keyedit.c:3458
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "�Est� seguro de querer elegir esta clave como revocador designado? (s/N) "
 
-#: g10/keyedit.c:3525
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite las selecciones de las claves secretas.\n"
 
-#: g10/keyedit.c:3531
+#: g10/keyedit.c:3526
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3530
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando fecha de caducidad de subclave.\n"
 
-#: g10/keyedit.c:3538
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3582
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No puede cambiar la fecha de caducidad de una clave v3\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3598
 msgid "No corresponding signature in secret ring\n"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3678
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "AVISO: la subclave de firmado %s no tiene certificado cruzado\n"
 
-#: g10/keyedit.c:3679
+#: g10/keyedit.c:3684
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3841
+#: g10/keyedit.c:3846
 msgid "Please select exactly one user ID.\n"
 msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
 
-#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
+#: g10/keyedit.c:3885 g10/keyedit.c:3995 g10/keyedit.c:4115 g10/keyedit.c:4256
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
 
-#: g10/keyedit.c:4051
+#: g10/keyedit.c:4056
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduzca la URL de su servidor de claves preferido: "
 
-#: g10/keyedit.c:4131
+#: g10/keyedit.c:4136
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Seguro que quiere reemplazarlo? (s/N) "
 
-#: g10/keyedit.c:4132
+#: g10/keyedit.c:4137
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Seguro que quiere borrarlo? (s/N) "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4199
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notaci�n de firma: "
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4348
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "�Sobreescribir? (s/N) "
 
-#: g10/keyedit.c:4407
+#: g10/keyedit.c:4412
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hay ning�n identificador de usuario con el �ndice %d\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4470
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hay ning�n identificador de usuario con el �ndice %d\n"
 
-#: g10/keyedit.c:4492
+#: g10/keyedit.c:4497
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No existe una subclave con �ndice %d\n"
 
-#: g10/keyedit.c:4627
+#: g10/keyedit.c:4632
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \"%s\"\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4635 g10/keyedit.c:4699 g10/keyedit.c:4742
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "firmada con su clave %s el %s%s%s\n"
 
-#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 msgid " (non-exportable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4641
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta firma caduc� el %s.\n"
 
-#: g10/keyedit.c:4640
+#: g10/keyedit.c:4645
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�De verdad quiere revocarla? (s/N) "
 
-#: g10/keyedit.c:4644
+#: g10/keyedit.c:4649
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N)"
 
-#: g10/keyedit.c:4671
+#: g10/keyedit.c:4676
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Ha firmado estos IDs de usuario con la clave %s:\n"
 
-#: g10/keyedit.c:4697
+#: g10/keyedit.c:4702
 msgid " (non-revocable)"
 msgstr " (no revocable)"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4709
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocada por la clave %s el %s\n"
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4731
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:4746
+#: g10/keyedit.c:4751
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Crear los certificados de revocaci�n realmente? (s/N) "
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4781
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:4846
+#: g10/keyedit.c:4851
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:4863
+#: g10/keyedit.c:4868
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "AVISO: un ID de usuario tiene fecha %d segundos en el futuro\n"
 
-#: g10/keyedit.c:4927
+#: g10/keyedit.c:4932
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La clave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:4989
+#: g10/keyedit.c:4994
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La subclave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:5084
+#: g10/keyedit.c:5089
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Mostrando ID fotogr�fico %s de tama�o %ld para la clave %s (uid %d)\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "preferencia `%s' duplicada\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 msgid "too many cipher preferences\n"
 msgstr "demasiadas preferencias de cifrado\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 msgid "too many digest preferences\n"
 msgstr "demasiadas preferencias de resumen\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 msgid "too many compression preferences\n"
 msgstr "demasiadas preferencias de compresi�n\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "caracter inv�lido `%s' en cadena de preferencias\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:876
 msgid "writing direct signature\n"
 msgstr "escribiendo firma directa\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:915
 msgid "writing self signature\n"
 msgstr "escribiendo autofirma\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:965
 msgid "writing key binding signature\n"
 msgstr "escribiendo la firma de comprobaci�n de clave\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
+#: g10/keygen.c:2776
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de clave incorrecto; se usar�n %u bits\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de clave redondeado a %u bits\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1331
 msgid "Sign"
 msgstr "Firma"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1334
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1337
 msgid "Encrypt"
 msgstr "Cifrado"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1340
 msgid "Authenticate"
 msgstr "Autentificaci�n"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1348
 msgid "SsEeAaQq"
 msgstr "FfCcAaSs"
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1367
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Posibles accriones para una %s clave: "
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1371
 msgid "Current allowed actions: "
 msgstr "Acciones permitidas actualmente: "
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1376
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Conmutar la capacidad de firmar\n"
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1379
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Conmutar la capacidad de cifrado\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1382
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Conmutar la capacidad de autentificaci�n\n"
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1385
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Acabado\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1441
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1443
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA y ElGamal (por defecto)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s�lo firmar)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1446
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (permite elegir capacidades)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1448
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (s�lo cifrar)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (s�lo firmar)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (s�lo cifrar)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1453
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (permite elegir capacidades)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1522
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "El par de claves DSA tendr� %u bits.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1532
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "las claves %s pueden tener entre %u y %u bits de longitud.\n"
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1539
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�De qu� tama�o quiere la clave? (%u) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1553
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "los tama�os de claves %s deben estar en el rango %u-%u\n"
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1559
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "El tama�o requerido es de %u bits\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1564 g10/keygen.c:1569
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1618
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3910,7 +3915,7 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1629
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3926,38 +3931,38 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Key is valid for? (0) "
 msgstr "�Validez de la clave (0)? "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Clave v�lida �durante (0)? "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1673
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1680
 msgid "Key does not expire at all\n"
 msgstr "La clave nunca caduca\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Signature does not expire at all\n"
 msgstr "La firma nunca caduca\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1686
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clave caduca %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1687
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1693
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3965,11 +3970,11 @@ msgstr ""
 "Su sistema no puede mostrar fechas m�s all� del 2038.\n"
 "Sin embargo funcionar� correctamente hasta el 2106.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1698
 msgid "Is this correct? (y/N) "
 msgstr "�Es correcto? (s/n) "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1713
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3985,44 +3990,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1726
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido en el nombre\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un n�mero\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1738
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1746
 msgid "Email address: "
 msgstr "Direcci�n de correo electr�nico: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1752
 msgid "Not a valid email address\n"
 msgstr "Direcci�n inv�lida\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1760
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1766
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido en el comentario\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1789
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� usando el juego de caracteres `%s'.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1795
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4033,7 +4038,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1800
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor no ponga la direcci�n de correo-e en el nombre real o en el "
@@ -4050,23 +4055,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1826
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (S)alir? "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (V)ale/(S)alir? "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:1846
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primero el error.\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1886
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4074,12 +4079,12 @@ msgstr ""
 "Necesita una frase contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:1896 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1902
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4091,7 +4096,7 @@ msgstr ""
 "la opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:1924
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4104,50 +4109,50 @@ msgstr ""
 "generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
 "entrop�a.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2722
 msgid "Key generation canceled.\n"
 msgstr "Creaci�n de claves cancelada.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:2921 g10/keygen.c:3068
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo clave p�blica en `%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:2923 g10/keygen.c:3071
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "escribiendo apuntador de la clave privada en `%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:2926 g10/keygen.c:3074
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3057
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "anillo p�blico de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3063
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "anillo privado de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3081
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "error escribiendo anillo p�blico `%s': %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3088
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "error escribiendo anillo privado `%s': %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3111
 msgid "public and secret key created and signed.\n"
 msgstr "claves p�blica y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3122
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4155,12 +4160,12 @@ msgstr ""
 "Tenga en cuenta que esta clave no puede ser usada para cifrar. Puede usar\n"
 "la orden \"--edit-key\" para crear una subclave con este prop�sito.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4168,7 +4173,7 @@ msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4176,25 +4181,25 @@ msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3197 g10/keygen.c:3326
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: crear subclaves para claves V3 no sigue el est�ndar OpenPGP\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3236 g10/keygen.c:3359
 msgid "Really create? (y/N) "
 msgstr "�Crear de verdad? (s/N) "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3524
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "almacenado de clave en la tarjeta fallido: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3571
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "no se puede crear fichero de respaldo `%s': %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3597
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: copia de seguridad de la clave guardada en `%s'\n"
@@ -4477,208 +4482,212 @@ msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
 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:240
+#: g10/mainproc.c:239
 #, 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:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s clave de sesi�n cifrada\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:300
 #, 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:382
+#: g10/mainproc.c:381
 #, c-format
 msgid "public key is %s\n"
 msgstr "la clave p�blica es %s\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:438
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados con la clave p�blica: DEK correcta\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:471
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:475 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:479
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado con clave %s, ID %s\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:493
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave p�blica fallido: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:507
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu frases contrase�a\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:509
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 frase contrase�a\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:540 g10/mainproc.c:562
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suponiendo %s datos cifrados\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:548
 #, 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:581
+#: g10/mainproc.c:580
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:584
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATENCI�N: la intgridad del mensaje no est� protegida\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:597
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCI�N: �el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:603
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:624
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitente solicit� \"s�lo-para-tus-ojos\"\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:626
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:711
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr ""
+
+#: g10/mainproc.c:839
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci�n independiente - use \"gpg --import\" para aplicarla\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1187
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Firma correcta de \"%s\""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1430
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificaci�n de la firma\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1539
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "no se puede trabajar con firmas m�ltiples\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1550
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Firmado el %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1551
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               usando %s clave %s\n"
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1555
 #, 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:1544
+#: g10/mainproc.c:1575
 msgid "Key available at: "
 msgstr "Clave disponible en: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma INCORRECTA de \"%s\""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma caducada de \"%s\""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma correcta de \"%s\""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr "[incierto]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1797
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \"%s\""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1895
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma caducada en %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1900
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1903
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "firma %s, algoritmo de resumen %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr "binaria"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr "modotexto"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 msgid "unknown"
 msgstr "desconocido"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
 msgstr "no es una firma separada\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:2037
 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:2013
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma al viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z inv�lido detectado en proc_tree()\n"
 
@@ -4811,17 +4820,17 @@ msgstr "AVISO: las opciones en `%s' no est�n a�n activas en esta ejecuci�n\n"
 msgid "directory `%s' created\n"
 msgstr "directorio `%s' creado\n"
 
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:143
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "no puedo manejar el algoritmo de clave p�blica %d\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:713
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVISO: clave de sesi�n cifrada sim�tricamente potencialmente insegura\n"
 
-#: g10/parse-packet.c:1159
+#: g10/parse-packet.c:1164
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquete de tipo %d tiene el bit cr�tico activado\n"
@@ -5564,12 +5573,12 @@ msgstr ""
 "AVISO: no puedo expandir el %% de la URL del servidor de claves\n"
 "preferido. Se usa sin expandir.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:346
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "la comprobaci�n de la firma creada fall�: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:355
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s firma de: \"%s\"\n"
@@ -5592,11 +5601,11 @@ msgstr ""
 msgid "signing:"
 msgstr "firmando:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1101
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s�lo puede firmar en claro con claves PGP 2.x estando en modo --pgp2\n"
 
-#: g10/sign.c:1278
+#: g10/sign.c:1280
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "se usar� un cifrado %s\n"
diff --git a/po/et.po b/po/et.po
index 7203dd918..98d68d190 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: [email protected]\n"
-"POT-Creation-Date: 2006-12-04 15:05+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
@@ -40,10 +40,10 @@ msgstr "kirjutan salajase v�tme faili `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
+#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -76,9 +76,9 @@ msgstr "`%s' ei �nnestu lugeda: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "m�rkus: random_seed faili ei uuendatud\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
+#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
+#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
@@ -391,15 +391,15 @@ msgstr "salajane v�ti ei ole k�ttesaadav"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
+#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
+#: g10/keygen.c:1456
 msgid "Your selection? "
 msgstr "Teie valik? "
 
@@ -577,8 +577,8 @@ msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
+#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
@@ -602,7 +602,7 @@ msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 msgid "secret key already stored on a card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1319 g10/keyedit.c:1351
 msgid "quit this menu"
 msgstr "v�lju sellest men��st"
 
@@ -611,7 +611,7 @@ msgstr "v�lju sellest men��st"
 msgid "show admin commands"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1322 g10/keyedit.c:1354
 msgid "show this help"
 msgstr "n�ita seda abiinfot"
 
@@ -668,7 +668,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1457 g10/keyedit.c:1617
 msgid "Command> "
 msgstr "K�sklus> "
 
@@ -687,7 +687,7 @@ msgstr "vastuolulised k�sud\n"
 msgid "Admin commands are not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1602 g10/keyedit.c:2238
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane k�sklus (proovige \"help\")\n"
 
@@ -742,7 +742,7 @@ msgstr "Korrake parooli: "
 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:3868 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -752,7 +752,7 @@ msgstr "`%s' ei �nnestu avada\n"
 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:3392 g10/keyserver.c:1705
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3386 g10/keyserver.c:1705
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -801,7 +801,7 @@ msgstr "avaliku v�tme \"%s\" jaoks on salajane v�ti!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "selle kustutamiseks kasutage v�tit \"--delete-secret-keys\".\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:213 g10/sign.c:1286
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
@@ -871,12 +871,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:91 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:292
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s kr�pteeritud andmed\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:296
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
@@ -1021,7 +1021,7 @@ msgstr "HOIATUS: salajases v�tmes %08lX puudub lihtne SK kontrollsumma\n"
 msgid "WARNING: nothing exported\n"
 msgstr "HOIATUS: midagi ei eksporditud\n"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:379
 msgid ""
 "@Commands:\n"
 " "
@@ -1029,128 +1029,128 @@ msgstr ""
 "@K�sud:\n"
 " "
 
-#: g10/gpg.c:380
+#: g10/gpg.c:381
 msgid "|[file]|make a signature"
 msgstr "|[fail]|loo allkiri"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "|[file]|make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:383
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "encrypt data"
 msgstr "kr�pteeri andmed"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "encryption only with symmetric cipher"
 msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "decrypt data (default)"
 msgstr "dekr�pteeri andmed (vaikimisi)"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "list keys"
 msgstr "n�ita v�tmeid"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:394
 msgid "list keys and signatures"
 msgstr "n�ita v�tmeid ja allkirju"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontrolli v�tmete allkirju"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "list keys and fingerprints"
 msgstr "n�ita v�tmeid ja s�rmej�lgi"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "list secret keys"
 msgstr "n�ita salajasi v�tmeid"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "generate a new key pair"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "remove keys from the public keyring"
 msgstr "eemalda v�tmed avalike v�tmete hoidlast"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "remove keys from the secret keyring"
 msgstr "eemalda v�tmed salajaste v�tmete hoidlast"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "sign a key"
 msgstr "allkirjasta v�ti"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "sign a key locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:404
 msgid "sign or edit a key"
 msgstr "allkirjasta v�i toimeta v�tit"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "generate a revocation certificate"
 msgstr "genereeri t�histamise sertifikaat"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "export keys"
 msgstr "ekspordi v�tmed"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:408
 msgid "export keys to a key server"
 msgstr "ekspordi v�tmed v�tmeserverisse"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:409
 msgid "import keys from a key server"
 msgstr "impordi v�tmed v�tmeserverist"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "search for keys on a key server"
 msgstr "otsi v�tmeid v�tmeserverist"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:413
 msgid "update all keys from a keyserver"
 msgstr "uuenda v�tmeid v�tmeserverist"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:417
 msgid "import/merge keys"
 msgstr "impordi/mesti v�tmed"
 
-#: g10/gpg.c:419
+#: g10/gpg.c:420
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:421
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:422
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "update the trust database"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/gpg.c:437
+#: g10/gpg.c:438
 msgid "|algo [files]|print message digests"
 msgstr "|algo [failid]|tr�ki teatel�hendid"
 
-#: g10/gpg.c:441 g10/gpgv.c:71
+#: g10/gpg.c:442 g10/gpgv.c:70
 msgid ""
 "@\n"
 "Options:\n"
@@ -1160,51 +1160,51 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: g10/gpg.c:445
+#: g10/gpg.c:446
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|kr�pti NIMEle"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "use this user-id to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:458
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
 
-#: g10/gpg.c:462
+#: g10/gpg.c:463
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:477
 msgid "use as output file"
 msgstr "kasuta v�ljundfailina"
 
-#: g10/gpg.c:478 g10/gpgv.c:73
+#: g10/gpg.c:479 g10/gpgv.c:72
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "do not make any changes"
 msgstr "�ra tee mingeid muutusi"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:491
 msgid "prompt before overwriting"
 msgstr "k�si enne �lekirjutamist"
 
-#: g10/gpg.c:531
+#: g10/gpg.c:532
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:532
+#: g10/gpg.c:533
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1212,7 +1212,7 @@ msgstr ""
 "@\n"
 "(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
 
-#: g10/gpg.c:564
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1232,15 +1232,15 @@ msgstr ""
 " --list-keys [nimed]        n�ita v�tmeid\n"
 " --fingerprint [nimed]      n�ita s�rmej�lgi\n"
 
-#: g10/gpg.c:763 g10/gpgv.c:98
+#: g10/gpg.c:766 g10/gpgv.c:97
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:783
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1250,7 +1250,7 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: g10/gpg.c:794
+#: g10/gpg.c:797
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1258,576 +1258,581 @@ msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid "Pubkey: "
 msgstr "Avalik v�ti: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2310
+#: g10/gpg.c:806 g10/keyedit.c:2304
 msgid "Cipher: "
 msgstr "�iffer: "
 
-#: g10/gpg.c:809
+#: g10/gpg.c:812
 msgid "Hash: "
 msgstr "R�si: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2356
+#: g10/gpg.c:818 g10/keyedit.c:2350
 msgid "Compression: "
 msgstr "Pakkimine: "
 
-#: g10/gpg.c:898
+#: g10/gpg.c:901
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: g10/gpg.c:1046
+#: g10/gpg.c:1049
 msgid "conflicting commands\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1067
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "grupi definitsioonis \"%s\" puudub s�mbol =\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, 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:1291
+#: g10/gpg.c:1294
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1300
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, 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:1303
+#: g10/gpg.c:1306
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1444
+#: g10/gpg.c:1447
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1954
+#: g10/gpg.c:1957
 #, 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:1996
+#: g10/gpg.c:1999
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: g10/gpg.c:2000
+#: g10/gpg.c:2003
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: g10/gpg.c:2007
+#: g10/gpg.c:2010
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
 
-#: g10/gpg.c:2236
+#: g10/gpg.c:2239
 #, 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:2402 g10/gpg.c:2414
+#: g10/gpg.c:2405 g10/gpg.c:2417
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2494
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "%s ei ole lubatud kooditabel\n"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
 
-#: g10/gpg.c:2768
+#: g10/gpg.c:2773
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2771
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/gpg.c:2858
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2875
 #, 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:2880
+#: g10/gpg.c:2890
 #, 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:2894
+#: g10/gpg.c:2904
 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:2900
+#: g10/gpg.c:2910
 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:2906
+#: g10/gpg.c:2916
 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:2919
+#: g10/gpg.c:2929
 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:2986 g10/gpg.c:3010
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:2992 g10/gpg.c:3016
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:2998
+#: g10/gpg.c:3008
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3004
+#: g10/gpg.c:3014
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3029
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3031
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3033
 #, 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:3025
+#: g10/gpg.c:3035
 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:3027
+#: g10/gpg.c:3037
 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:3030
+#: g10/gpg.c:3040
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3044
 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:3041
+#: g10/gpg.c:3051
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3060
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku �ifri eelistused\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3064
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku l�hendi eelistused\n"
 
-#: g10/gpg.c:3058
+#: g10/gpg.c:3068
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/gpg.c:3091
+#: g10/gpg.c:3101
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei t��ta veel koos %s-ga\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3148
 #, 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:3143
+#: g10/gpg.c:3153
 #, 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:3148
+#: g10/gpg.c:3158
 #, 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:3250
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3271
 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:3272
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3291
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3314
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3306
+#: g10/gpg.c:3316
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3319
 #, 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:3327
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3365
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3367
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3370
 #, 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:3380
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/gpg.c:3426
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kasutaja-id] [v�tmehoidla]"
 
-#: g10/gpg.c:3560
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3572
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3564
+#: g10/gpg.c:3574
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "v�tme eksport eba�nnestus: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3585
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3595
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3644
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane r�sialgoritm `%s'\n"
 
-#: g10/gpg.c:3854
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/gpg.c:3858
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4172
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4174
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4207
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
@@ -1854,42 +1859,42 @@ msgstr ""
 "Vigane v�ti %08lX muudeti kehtivaks v�tme --allow-non-selfsigned-uid "
 "kasutamisega\n"
 
-#: g10/getkey.c:2380 g10/keyedit.c:3712
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, 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:2611
+#: g10/getkey.c:2614
 #, 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:2658
+#: g10/getkey.c:2661
 #, 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"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:73
 msgid "be somewhat more quiet"
 msgstr "ole m�nev�rra vaiksem"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "take the keys from this keyring"
 msgstr "v�ta v�tmed sellest v�tmehoidlast"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:76
 msgid "make timestamp conflicts only a warning"
 msgstr "teata ajatemplite konfliktist ainult hoiatusega"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:77
 msgid "|FD|write status info to this FD"
 msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:101
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Kasuta: gpgv [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:104
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2411,7 +2416,7 @@ msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
 msgid "no writable keyring found: %s\n"
 msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjutan faili `%s'\n"
@@ -2768,42 +2773,42 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
+#: g10/keyedit.c:890 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/e) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
+#: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  Ei saa allkirjastada.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Kasutaja ID \"%s\" on aegunud."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Allkirjastan t�esti? "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2812,11 +2817,11 @@ msgstr ""
 "Iseenda allkiri \"%s\"\n"
 "on PGP 2.x stiilis allkiri.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Kas te soovite seda edutada OpenPGP iseenda allkirjaks? (j/E) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2825,11 +2830,11 @@ msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on aegunud.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Kas soovite luua uut allkirja et asendada vana aegunud? (j/E) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2838,54 +2843,54 @@ msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on lokaalne allkiri.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Kas te soovite seda edutada t�ielikuks eksporditavaks allkirjaks? (j/E) "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" on juba lokaalselt allkirjastatud v�tmega %08lX\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" on juba allkirjastatud v�tmega %08lX\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/E) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "V�tmega %08lX pole midagi allkirjastada\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "See v�ti on aegunud!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "See v�ti aegub %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Soovite, et teie allkiri aeguks samal ajal? (J/e) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:883
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "--pgp2 moodis ei saa PGP 2.x v�tmele OpenPGP allkirja anda.\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:885
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "See muudab v�tme PGP 2.x programmidega mitte-kasutatavaks.\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:910
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2895,32 +2900,32 @@ msgstr ""
 "kuulub ka tegelikult �lal mainitud isikule? Kui te ei tea, mida vastata,\n"
 "sisestage \"0\".\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ma ei vasta.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Ma ei ole �ldse kontrollinud.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Ma olen teinud pealiskaudset kontrolli.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ma olen kontrollinud v�ga hoolikalt.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:927
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Teie valik? (lisainfo saamiseks vajutage '?'): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:951
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2929,100 +2934,100 @@ msgstr ""
 "Olete t�esti kindel, et soovite seda v�tit oma\n"
 "v�tmega allkirjastada: \""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:958
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "See saab olema iseenda allkiri.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "HOIATUS: allkirja ei m�rgita mitte-eksporditavaks.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:972
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "HOIATUS: allkirja ei m�rgita kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:982
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Allkiri m�rgitakse mitte-eksporditavaks.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:989
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Ma ei ole seda v�tit �ldse kontrollinud.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1001
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Ma olen seda v�tit kontrollinud ainult pealiskaudselt.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1006
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Ma olen kontrollinud seda v�tit v�ga hoolikalt.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1016
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Allkirjastan t�esti? "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
-#: g10/keyedit.c:5004 g10/sign.c:352
+#: g10/keyedit.c:1061 g10/keyedit.c:4793 g10/keyedit.c:4884 g10/keyedit.c:4948
+#: g10/keyedit.c:5009 g10/sign.c:351
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1126
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1137 g10/keygen.c:3215
 msgid "This key is not protected.\n"
 msgstr "See v�ti ei ole kaitstud.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1145 g10/keygen.c:3218
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1149 g10/keygen.c:3222
 msgid "Key is protected.\n"
 msgstr "V�ti on kaitstud.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1173
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Seda v�tit ei �nnestu toimetada: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1179
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3030,11 +3035,11 @@ msgstr ""
 "Sisestage sellele salajasele v�tmele uus parool.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1188 g10/keygen.c:1895
 msgid "passphrase not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1193
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3042,206 +3047,206 @@ msgstr ""
 "Te ei soovi parooli - see on t�en�oliselt *halb* idee!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1196
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Kas te t�esti soovite seda teha? "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1267
 msgid "moving a key signature to the correct place\n"
 msgstr "t�stan v�tme allkirja �igesse kohta\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1353
 msgid "save and quit"
 msgstr "salvesta ja v�lju"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1356
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1357
 msgid "list key and user IDs"
 msgstr "n�ita v�tit ja kasutaja IDd"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1359
 msgid "select user ID N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1360
 #, fuzzy
 msgid "select subkey N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1361
 #, fuzzy
 msgid "check signatures"
 msgstr "t�hista allkirjad"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1366
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1379
 msgid "add a user ID"
 msgstr "lisa kasutaja ID"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1381
 msgid "add a photo ID"
 msgstr "lisa foto ID"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1383
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "kustuta kasutaja ID"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1388
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1392
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1394
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1396
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "kustuta sekundaarne v�ti"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1402
 msgid "add a revocation key"
 msgstr "lisa t�histamise v�ti"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "m�rgi kasutaja ID primaarseks"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "l�lita salajaste v�i avalike v�tmete loendi vahel"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1413
 msgid "list preferences (expert)"
 msgstr "n�ita eelistusi (ekspert)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1415
 msgid "list preferences (verbose)"
 msgstr "n�ita eelistusi (detailsena)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "muuda parooli"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "muuda omaniku usaldust"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "t�hista kasutaja ID"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "t�hista sekundaarne v�ti"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "luba v�ti"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "blokeeri v�ti"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "n�ita foto ID"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1446
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1564
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "viga salajase v�tmebloki `%s' lugemisel: %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1582
 msgid "Secret key is available.\n"
 msgstr "Salajane v�ti on kasutatav.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1663
 msgid "Need the secret key to do this.\n"
 msgstr "Selle tegamiseks on vaja salajast v�tit.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1671
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Palun kasutage k�igepealt k�sku \"toggle\".\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1690
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3249,241 +3254,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1730
 msgid "Key is revoked."
 msgstr "V�ti on t�histatud."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1749
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1756
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1765
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "tundmatu allkirja klass"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1788
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "See k�sklus ei ole %s moodis lubatud.\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
 msgid "You must select at least one user ID.\n"
 msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1812
 msgid "You can't delete the last user ID!\n"
 msgstr "Viimast kasutaja ID ei saa kustutada!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1814
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1815
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Kas eemaldan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1865
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Kas eemaldan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1877
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Te peata valima v�hemalt �he v�tme.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1905
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1960
 msgid "You must select at least one key.\n"
 msgstr "Te peata valima v�hemalt �he v�tme.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1963
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1964
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit kustutada? "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:1999
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2000
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Kas t�histan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2018
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit t�histada? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2029
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Kas te t�esti soovite valitud v�tmeid t�histada? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit t�histada? "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2081
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2123
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "sea eelistuste nimekiri"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Kas t�esti uuendan seaded? "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2199
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvestan muutused? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2202
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "V�ljun salvestamata? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2212
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2226
 msgid "Key not changed so no update needed.\n"
 msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2327
 msgid "Digest: "
 msgstr "Teatel�hend: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2379
 msgid "Features: "
 msgstr "Omadused: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2390
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2405 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2413 g10/keyedit.c:2414
 #, fuzzy
 msgid "Notations: "
 msgstr "Noteering: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2624
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x stiilis kasutaja ID ei oma seadeid.\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2683
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Selle v�tme v�ib olla t�histanud %s v�ti "
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2704
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Selle v�tme v�ib olla t�histanud %s v�ti "
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2710
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (tundlik)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keyedit.c:2726 g10/keyedit.c:2782 g10/keyedit.c:2843 g10/keyedit.c:2858
 #: g10/keylist.c:194 g10/keyserver.c:511
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2729 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2731 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2733 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2735
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2754
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2761
 msgid "This key has been disabled"
 msgstr "See v�ti on blokeeritud"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2789 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2813
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3491,19 +3496,19 @@ 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:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2944
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3511,7 +3516,7 @@ msgstr ""
 "HOIATUS: �htegi kasutaja ID pole m�rgitud primaarseks.  See k�sklus v�ib\n"
 "              p�hjustada muu kasutaja ID primaarseks m��ramist.\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3005
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3520,75 +3525,75 @@ msgstr ""
 "HOIATUS: See on PGP2-stiilis v�ti. Foto ID lisamine v�ib sundida m�ningaid\n"
 "         PGP versioone seda v�tit tagasi l�kkama.\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3351
+#: g10/keyedit.c:3010 g10/keyedit.c:3345
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka lisada? (j/E) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3016
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Foto IDd ei saa PGP2 v�tmele lisada.\n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3156
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3166
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3170
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3176
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3190
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3191
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Kustutatud %d allkirja.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3194
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3227 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "vigane pakend"
 
-#: g10/keyedit.c:3235
+#: g10/keyedit.c:3229
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:3242
+#: g10/keyedit.c:3236
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3237
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3246
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3340
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3597,370 +3602,370 @@ msgstr ""
 "HOIATUS: See on PGP2-stiilis v�ti. M��ratud t�histaja lisamine v�ib\n"
 "         p�hjustada m�ningaid PGP versioone seda v�tit tagasi l�kkama.\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3351
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x-stiili v�tmele ei saa m��ratud t�histajat lisada.\n"
 
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3371
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3396
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x stiilis v�tit ei saa nimetada m��ratud t�histajaks\n"
 
-#: g10/keyedit.c:3417
+#: g10/keyedit.c:3411
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "te ei saa nimetada v�tit iseenda m��ratud t�histajaks\n"
 
-#: g10/keyedit.c:3439
+#: g10/keyedit.c:3433
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "HOIATUS: See v�ti on m��ratud t�histaja poolt t�histatud!\n"
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3452
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "HOIATUS: v�tme seadmist m��ratud t�histajaks ei saa tagasi v�tta!\n"
 
-#: g10/keyedit.c:3464
+#: g10/keyedit.c:3458
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Olete kindel, et soovite seda v�tit seada m��ratud t�histajaks? (j/E): "
 
-#: g10/keyedit.c:3525
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
 
-#: g10/keyedit.c:3531
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3538
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3582
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3598
 msgid "No corresponding signature in secret ring\n"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3678
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "HOIATUS: allkirjastamise alamv�ti %08lX ei ole rist-sertifitseeritud\n"
 
-#: g10/keyedit.c:3679
+#: g10/keyedit.c:3684
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3841
+#: g10/keyedit.c:3846
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
 
-#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
+#: g10/keyedit.c:3885 g10/keyedit.c:3995 g10/keyedit.c:4115 g10/keyedit.c:4256
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "j�tan kasutaja \"%s\" v3 iseenda allkirja vahele\n"
 
-#: g10/keyedit.c:4051
+#: g10/keyedit.c:4056
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4131
+#: g10/keyedit.c:4136
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:4132
+#: g10/keyedit.c:4137
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4199
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4348
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Kirjutan �le (j/E)? "
 
-#: g10/keyedit.c:4407
+#: g10/keyedit.c:4412
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4470
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4492
+#: g10/keyedit.c:4497
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4627
+#: g10/keyedit.c:4632
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4635 g10/keyedit.c:4699 g10/keyedit.c:4742
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4641
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:4640
+#: g10/keyedit.c:4645
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka t�histada? (j/E) "
 
-#: g10/keyedit.c:4644
+#: g10/keyedit.c:4649
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E) "
 
-#: g10/keyedit.c:4671
+#: g10/keyedit.c:4676
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
 
-#: g10/keyedit.c:4697
+#: g10/keyedit.c:4702
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4709
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   t�histanud %08lX %s\n"
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4731
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute t�histama j�rgmisi allkirju:\n"
 
-#: g10/keyedit.c:4746
+#: g10/keyedit.c:4751
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4781
 msgid "no secret key\n"
 msgstr "salajast v�tit pole\n"
 
-#: g10/keyedit.c:4846
+#: g10/keyedit.c:4851
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:4863
+#: g10/keyedit.c:4868
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "HOIATUS: kasutaja ID allkirja ajatempel on %d sekundit tulevikus\n"
 
-#: g10/keyedit.c:4927
+#: g10/keyedit.c:4932
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:4989
+#: g10/keyedit.c:4994
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:5084
+#: g10/keyedit.c:5089
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "N�itan %s foto IDd suurusega %ld, v�ti 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:876
 msgid "writing direct signature\n"
 msgstr "kirjutan otsese allkirja\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:915
 msgid "writing self signature\n"
 msgstr "kirjutan iseenda allkirja\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:965
 msgid "writing key binding signature\n"
 msgstr "kirjutan v�tit siduva allkirja\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
+#: g10/keygen.c:2776
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "vigane v�tme suurus; kasutan %u bitti\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "v�tme suurus �mardatud �les %u bitini\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1331
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1334
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1337
 #, fuzzy
 msgid "Encrypt"
 msgstr "kr�pteeri andmed"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1340
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1348
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1367
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1371
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1376
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1379
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1382
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1385
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1441
 msgid "Please select what kind of key you want:\n"
 msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1443
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1453
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1522
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA v�tmepaari pikkuseks saab 1024 bitti.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1532
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1539
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Millist v�tmepikkust te soovite? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1553
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1559
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Soovitud v�tmepikkus on %u bitti\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1564 g10/keygen.c:1569
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "�mardatud �les %u bitini\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1618
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3976,7 +3981,7 @@ msgstr ""
 "      <n>m = v�ti aegub n kuuga\n"
 "      <n>y = v�ti aegub n aastaga\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1629
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3992,40 +3997,40 @@ msgstr ""
 "      <n>m = allkiri aegub n kuuga\n"
 "      <n>y = allkiri aegub n aastaga\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Key is valid for? (0) "
 msgstr "V�ti on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allkiri on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1673
 msgid "invalid value\n"
 msgstr "vigane v��rtus\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1680
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1686
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s aegub %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1687
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1693
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4033,12 +4038,12 @@ msgstr ""
 "Teie s�steem ei saa esitada kuup�evi peale aastat 2038.\n"
 "Siiski k�sitletakse neid korrektselt aastani 2106.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1698
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "On see �ige (j/e)? "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1713
 #, fuzzy
 msgid ""
 "\n"
@@ -4054,44 +4059,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1726
 msgid "Real name: "
 msgstr "P�risnimi: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Invalid character in name\n"
 msgstr "Lubamatu s�mbol nimes\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei v�i alata numbriga\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1738
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimes peab olema v�hemalt 5 s�mbolit\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1746
 msgid "Email address: "
 msgstr "E-posti aadress: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1752
 msgid "Not a valid email address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1760
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1766
 msgid "Invalid character in comment\n"
 msgstr "Lubamatu s�mbol kommentaaris\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1789
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Te kasutate kooditabelit `%s'.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1795
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4102,7 +4107,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1800
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�rge palun kirjutage e-posti aadressi p�risnimesse ega kommentaari\n"
 
@@ -4117,23 +4122,23 @@ msgstr "�rge palun kirjutage e-posti aadressi p�risnimesse ega kommentaari\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoVv"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1826
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (V)�lju? "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (O)k/(V)�lju? "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:1846
 msgid "Please correct the error first\n"
 msgstr "Palun parandage k�igepealt viga\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1886
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4141,12 +4146,12 @@ msgstr ""
 "Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:1896 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1902
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4158,7 +4163,7 @@ msgstr ""
 "kasutades seda programmi v�tmega \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:1924
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4170,50 +4175,50 @@ msgstr ""
 "kasutada kettaid jne), see annaks juhuarvude generaatorile v�imaluse\n"
 "koguda paremat entroopiat.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2722
 msgid "Key generation canceled.\n"
 msgstr "V�tme genereerimine katkestati.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:2921 g10/keygen.c:3068
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjutan avaliku v�tme faili `%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:2923 g10/keygen.c:3071
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:2926 g10/keygen.c:3074
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3057
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjutatavat avalike v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3063
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjutatavat salajaste v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3081
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "viga avaliku v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3088
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3111
 msgid "public and secret key created and signed.\n"
 msgstr "avalik ja salajane v�ti on loodud ja allkirjastatud.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3122
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4223,43 +4228,43 @@ msgstr ""
 "Kr�ptimiseks tuleb genereerida teine v�ti, seda saate teha\n"
 "kasutades v�tit \"--edit-key\".\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekundit tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3197 g10/keygen.c:3326
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "M�RKUS: v3 v�tmetele alamv�tmete loomine ei ole OpenPGP �hilduv\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3236 g10/keygen.c:3359
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Loon t�esti? "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3524
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3571
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3597
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
@@ -4544,207 +4549,211 @@ msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:239
 #, 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:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s kr�pteeritud sessiooni v�ti\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:300
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:381
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "avalik v�ti on %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:438
 msgid "public key encrypted data: good DEK\n"
 msgstr "avaliku v�tmega kr�pteeritud andmed: hea DEK\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:471
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:475 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:479
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "kr�pteeritud %s v�tmega, ID %08lX\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:493
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "avaliku v�tmega lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:507
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "kr�pteeritud kasutades %lu parooli\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:509
 msgid "encrypted with 1 passphrase\n"
 msgstr "kr�pteeritud �he parooliga\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:540 g10/mainproc.c:562
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "eeldan %s kr�pteeritud andmeid\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:548
 #, 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:581
+#: g10/mainproc.c:580
 msgid "decryption okay\n"
 msgstr "lahtikr�pteerimine �nnestus\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:584
 msgid "WARNING: message was not integrity protected\n"
 msgstr "HOIATUS: teate koosk�lalisus ei ole tagatud\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:597
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "HOIATUS: kr�pteeritud teadet on muudetud!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:603
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:624
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "M�RKUS: saatja n�udis \"ainult-teie-silmadele\"\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:626
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "algne failinimi on='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:711
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr ""
+
+#: g10/mainproc.c:839
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "eraldiseisev t�histus - realiseerimiseks kasutage \"gpg --import\"\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1187
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1430
 msgid "signature verification suppressed\n"
 msgstr "allkirja kontroll j�eti �ra\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1539
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neid allkirju ei �nnestu t��delda\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1550
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1555
 #, 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:1544
+#: g10/mainproc.c:1575
 msgid "Key available at: "
 msgstr "V�tme leiate: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "HALB allkiri kasutajalt \""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Aegunud allkiri kasutajalt \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr "[ebakindel]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1797
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1895
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1900
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1903
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr "binaarne"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr "tekstimood"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 msgid "unknown"
 msgstr "tundmatu"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allkirja ei saa kontrollida: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
 msgstr "ei ole eraldiseisev allkiri\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:2037
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "HOIATUS: leidsin mitu allkirja. Kontrollitakse ainult esimest.\n"
 
-#: g10/mainproc.c:2013
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vana stiili (PGP 2.x) allkiri\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
 
@@ -4880,18 +4889,18 @@ msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
 msgid "directory `%s' created\n"
 msgstr "%s: kataloog on loodud\n"
 
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:143
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:713
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "HOIATUS: t�en�oliselt ebaturvaline s�mmeetriliselt kr�pteeritud sessiooni "
 "v�ti\n"
 
-#: g10/parse-packet.c:1159
+#: g10/parse-packet.c:1164
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
@@ -5638,12 +5647,12 @@ msgstr ""
 "HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:346
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:355
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s allkiri kasutajalt: \"%s\"\n"
@@ -5664,12 +5673,12 @@ msgstr ""
 msgid "signing:"
 msgstr "allkirjastan:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1101
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x stiilis v�tmetega saab avateksti allkirjastada ainult --pgp2 moodis\n"
 
-#: g10/sign.c:1278
+#: g10/sign.c:1280
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "kasutatakse %s kr�pteerimist\n"
diff --git a/po/fi.po b/po/fi.po
index 561e4a6be..62dc7c73b 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: [email protected]\n"
-"POT-Creation-Date: 2006-12-04 15:05+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <[email protected]>\n"
 "Language-Team: Finnish <[email protected]>\n"
@@ -56,10 +56,10 @@ msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
+#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -93,9 +93,9 @@ 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:481 g10/gpg.c:1008 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
+#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
+#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
@@ -412,15 +412,15 @@ msgstr "salaista avainta ei löydy"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
+#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tätä ei voi tehdä eräajossa\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
+#: g10/keygen.c:1456
 msgid "Your selection? "
 msgstr "Valintasi? "
 
@@ -598,8 +598,8 @@ msgstr "   (%d) RSA (vain salaus)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
+#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Valinta ei kelpaa.\n"
 
@@ -623,7 +623,7 @@ msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 msgid "secret key already stored on a card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1319 g10/keyedit.c:1351
 msgid "quit this menu"
 msgstr "ulos tästä valikosta"
 
@@ -632,7 +632,7 @@ msgstr "ulos tästä valikosta"
 msgid "show admin commands"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1322 g10/keyedit.c:1354
 msgid "show this help"
 msgstr "näytä tämä ohje"
 
@@ -689,7 +689,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1457 g10/keyedit.c:1617
 msgid "Command> "
 msgstr "Komento> "
 
@@ -708,7 +708,7 @@ msgstr "ristiriitainen komento\n"
 msgid "Admin commands are not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1602 g10/keyedit.c:2238
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 
@@ -763,7 +763,7 @@ msgstr "Toista salasana: "
 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:3868 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 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,7 +773,7 @@ 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:3392 g10/keyserver.c:1705
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3386 g10/keyserver.c:1705
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -822,7 +822,7 @@ msgstr "julkiselle avaimelle \"%s\" löytyy vastaava salainen avain!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "käytä valitsinta \"--delete-secret-keys\" poistaaksesi se ensin.\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:213 g10/sign.c:1286
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
@@ -889,12 +889,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:91 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:292
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s salattua dataa\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:296
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "salattu tuntemattomalla algoritmilla %d\n"
@@ -1040,7 +1040,7 @@ msgstr ""
 msgid "WARNING: nothing exported\n"
 msgstr "VAROITUS: mitään ei viety\n"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:379
 msgid ""
 "@Commands:\n"
 " "
@@ -1048,128 +1048,128 @@ msgstr ""
 "@Komennot:\n"
 " "
 
-#: g10/gpg.c:380
+#: g10/gpg.c:381
 msgid "|[file]|make a signature"
 msgstr "|[tiedosto]|tee allekirjoitus"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "|[file]|make a clear text signature"
 msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:383
 msgid "make a detached signature"
 msgstr "tee erillinen allekirjoitus"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "encrypt data"
 msgstr "salaa tiedot"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "encryption only with symmetric cipher"
 msgstr "salaa vain symmetrisellä salaimella"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "decrypt data (default)"
 msgstr "avaa tiedot (oletus)"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "verify a signature"
 msgstr "tarkista allekirjoitus"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "list keys"
 msgstr "näytä avaimet"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:394
 msgid "list keys and signatures"
 msgstr "näytä avaimet allekirjoituksineen"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tarkista avainten allekirjoitukset"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "list keys and fingerprints"
 msgstr "näytä avaimet sormenjälkineen"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "list secret keys"
 msgstr "näytä salaiset avaimet"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "generate a new key pair"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "remove keys from the public keyring"
 msgstr "poista avaimet julkisten avainten renkaasta"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "remove keys from the secret keyring"
 msgstr "poista avaimet salaisten avainten renkaasta"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "sign a key"
 msgstr "allekirjoita avain"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "sign a key locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:404
 msgid "sign or edit a key"
 msgstr "allekirjoita tai muokkaa avainta"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "generate a revocation certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "export keys"
 msgstr "vie avaimia"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:408
 msgid "export keys to a key server"
 msgstr "vie avaimia palvelimelle"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:409
 msgid "import keys from a key server"
 msgstr "nouda avaimia avainpalvelimelta"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "search for keys on a key server"
 msgstr "etsi avaimia avainpalvelimelta"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:413
 msgid "update all keys from a keyserver"
 msgstr "päivitä kaikki avaimet avainpalvelimelta"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:417
 msgid "import/merge keys"
 msgstr "nouda/liitä avaimia"
 
-#: g10/gpg.c:419
+#: g10/gpg.c:420
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:421
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:422
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "update the trust database"
 msgstr "päivitä luottamustietokanta"
 
-#: g10/gpg.c:437
+#: g10/gpg.c:438
 msgid "|algo [files]|print message digests"
 msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 
-#: g10/gpg.c:441 g10/gpgv.c:71
+#: g10/gpg.c:442 g10/gpgv.c:70
 msgid ""
 "@\n"
 "Options:\n"
@@ -1179,51 +1179,51 @@ msgstr ""
 "Valitsimet:\n"
 " "
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "create ascii armored output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: g10/gpg.c:445
+#: g10/gpg.c:446
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|salaa vastaanottajalle NIMI"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "use this user-id to sign or decrypt"
 msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:458
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
 
-#: g10/gpg.c:462
+#: g10/gpg.c:463
 msgid "use canonical text mode"
 msgstr "käytä tekstimuotoa"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:477
 msgid "use as output file"
 msgstr "käytä tulostustiedostona"
 
-#: g10/gpg.c:478 g10/gpgv.c:73
+#: g10/gpg.c:479 g10/gpgv.c:72
 msgid "verbose"
 msgstr "monisanainen"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "do not make any changes"
 msgstr "älä tee muutoksia"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:491
 msgid "prompt before overwriting"
 msgstr "kysy ennen ylikirjoittamista"
 
-#: g10/gpg.c:531
+#: g10/gpg.c:532
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:532
+#: g10/gpg.c:533
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1232,7 +1232,7 @@ msgstr ""
 "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
 "sivuilta)\n"
 
-#: g10/gpg.c:564
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1251,16 +1251,16 @@ msgstr ""
 " --list-keys [nimet]        näytä avaimet\n"
 " --fingerprint [nimet]      näytä sormenjäljet\n"
 
-#: g10/gpg.c:763 g10/gpgv.c:98
+#: g10/gpg.c:766 g10/gpgv.c:97
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <[email protected]>.\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:783
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1270,7 +1270,7 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: g10/gpg.c:794
+#: g10/gpg.c:797
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1278,577 +1278,582 @@ msgstr ""
 "\n"
 "Tuetut algoritmit:\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid "Pubkey: "
 msgstr "JulkAvain: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2310
+#: g10/gpg.c:806 g10/keyedit.c:2304
 msgid "Cipher: "
 msgstr "Salaus: "
 
-#: g10/gpg.c:809
+#: g10/gpg.c:812
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2356
+#: g10/gpg.c:818 g10/keyedit.c:2350
 msgid "Compression: "
 msgstr "Pakkaus: "
 
-#: g10/gpg.c:898
+#: g10/gpg.c:901
 msgid "usage: gpg [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: g10/gpg.c:1046
+#: g10/gpg.c:1049
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1067
 #, 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:1261
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, 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:1267
+#: g10/gpg.c:1270
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1276
 #, 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:1276
+#: g10/gpg.c:1279
 #, 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:1279
+#: g10/gpg.c:1282
 #, 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:1285
+#: g10/gpg.c:1288
 #, 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:1288
+#: g10/gpg.c:1291
 #, 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:1291
+#: g10/gpg.c:1294
 #, 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:1297
+#: g10/gpg.c:1300
 #, 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:1300
+#: g10/gpg.c:1303
 #, 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:1303
+#: g10/gpg.c:1306
 #, 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:1444
+#: g10/gpg.c:1447
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1954
+#: g10/gpg.c:1957
 #, 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:1996
+#: g10/gpg.c:1999
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
-#: g10/gpg.c:2000
+#: g10/gpg.c:2003
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: g10/gpg.c:2007
+#: g10/gpg.c:2010
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
 
-#: g10/gpg.c:2236
+#: g10/gpg.c:2239
 #, 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:2402 g10/gpg.c:2414
+#: g10/gpg.c:2405 g10/gpg.c:2417
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2494
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "%s ei kelpaa merkistöksi\n"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/gpg.c:2768
+#: g10/gpg.c:2773
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2771
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/gpg.c:2858
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2875
 #, 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:2880
+#: g10/gpg.c:2890
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/gpg.c:2894
+#: g10/gpg.c:2904
 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:2900
+#: g10/gpg.c:2910
 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:2906
+#: g10/gpg.c:2916
 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:2919
+#: g10/gpg.c:2929
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 
-#: g10/gpg.c:2986 g10/gpg.c:3010
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:2992 g10/gpg.c:3016
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:2998
+#: g10/gpg.c:3008
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3004
+#: g10/gpg.c:3014
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3029
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3031
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3033
 #, 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:3025
+#: g10/gpg.c:3035
 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:3027
+#: g10/gpg.c:3037
 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:3030
+#: g10/gpg.c:3040
 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:3034
+#: g10/gpg.c:3044
 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:3041
+#: g10/gpg.c:3051
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3060
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3064
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/gpg.c:3058
+#: g10/gpg.c:3068
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/gpg.c:3091
+#: g10/gpg.c:3101
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3148
 #, 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:3143
+#: g10/gpg.c:3153
 #, 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:3148
+#: g10/gpg.c:3158
 #, 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:3250
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3271
 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:3272
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [tiedostonimi]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3291
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3314
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3306
+#: g10/gpg.c:3316
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3319
 #, 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:3327
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--allekirjoita [tiedostonimi]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3365
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3367
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3370
 #, 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:3380
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [tiedostonimi]"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [tiedostonimi]"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key käyttäjätunnus"
 
-#: g10/gpg.c:3426
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key käyttäjätunnus"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key käyttäjätunnus [komennot]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [käyttäjätunnus] [avainrengas]"
 
-#: g10/gpg.c:3560
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3572
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/gpg.c:3564
+#: g10/gpg.c:3574
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3585
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3595
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/gpg.c:3644
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:3854
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[tiedostonimi]"
 
-#: g10/gpg.c:3858
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4172
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4174
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4207
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@ -1874,45 +1879,45 @@ 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:2380 g10/keyedit.c:3712
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, 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:2611
+#: g10/getkey.c:2614
 #, 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:2658
+#: g10/getkey.c:2661
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 "avain %08lX: salaisella avaimella ei ole vastaavaa \n"
 "julkista avainta - ohitetaan\n"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:73
 msgid "be somewhat more quiet"
 msgstr "ole jonkinverran hiljaisempi"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "take the keys from this keyring"
 msgstr "ota avaimet tästä avainrenkaasta"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:76
 msgid "make timestamp conflicts only a warning"
 msgstr "käsittele aikaleimakonfliktit pelkkinä varoituksina"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:77
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:101
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Käyttö: gpgv [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:104
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2443,7 +2448,7 @@ msgstr "avain %08lX: uusi avain - ohitetaan\n"
 msgid "no writable keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
@@ -2803,42 +2808,42 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
+#: g10/keyedit.c:890 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Haluatko varmasti edelleen allekirjoittaa? (k/E) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
+#: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  Allekirjoittaminen ei onnistu.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Käyttäjätunnus \"%s\" on vanhentunut."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2847,13 +2852,13 @@ msgstr ""
 "Oma-allekirjoitus kohteessa \"%s\"\n"
 "on PGP 2.x -muodon allekirjoitus.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 "Haluatko vahventaa sen täysin vientikelpoiseksi OpenPGP-allekirjoitukseksi? "
 "(k/E) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2862,11 +2867,11 @@ msgstr ""
 "Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
 "on vanhentunut.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Haluatko tehdä uuden allekirjoituksen korvaamaan vanhentuneen? (k/E) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2875,55 +2880,55 @@ msgstr ""
 "Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
 "on paikallinen allekirjoitus.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Haluatko vahventaa sen täysin vientikelpoiseksi allekirjoitukseksi? (k/E) "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" on jo allekirjoitettu paikallisesti avaimella %08lX\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" on jo allekirjoitettu avaimella %08lX\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Haluatko allekirjoittaa uudelleen joka tapauksessa? (k/E) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Avaimelle %08lX ei löydy mitään mitä allekirjoittaa\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Tämä avain on vanhentunut!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Avain vanhenee %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Haluatko allekirjoituksesi vanhenevan samaan aikaan? (K/e) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:883
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Et voi luoda OpenPGP-allekirjoitusta PGP 2.x -avaimella --pgp2-tilassa.\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:885
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Tämä tekisi avaimesta käyttökelvottoman PGP 2.x:lle.\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:910
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2932,32 +2937,32 @@ msgstr ""
 "Kuinka huolellisesti olet vahvistanut avaimen haltijan henkilöllisyyden?\n"
 "Jos et tiedä vastausta, syötä \"0\".\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) En vastaa.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) En ole tarkistanut lainkaan.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Olen suorittanut arkisen tarkistuksen.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Olen suorittanut huolellisen tarkistuksen.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:927
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Valintasi? (syöttämällä \"?\" saat lisätietoja): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:951
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2966,100 +2971,100 @@ msgstr ""
 "Haluatko varmasti allekirjoittaa tämän avaimen\n"
 "omalla avaimellasi: \""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:958
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Tämä tulee olemaan oma-allekirjoitus.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "VAROITUS: Tätä allekirjoitusta ei määritellä vientikelvottomaksi.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:972
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "VAROITUS: Tätä allekirjoitusta ei määritellä mitätöimättömäksi.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:982
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Tämä allekirjoitus määritellään vientikelvottomaksi.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:989
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Tämä allekirjoitus määritellään mitätöimättömäksi.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "En ole tarkistanut tätä avainta lainkaan.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1001
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Olen tarkistanut avaimen arkisesti.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1006
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Olen tarkistanut avaimen erittäin huolellisesti.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1016
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
-#: g10/keyedit.c:5004 g10/sign.c:352
+#: g10/keyedit.c:1061 g10/keyedit.c:4793 g10/keyedit.c:4884 g10/keyedit.c:4948
+#: g10/keyedit.c:5009 g10/sign.c:351
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1126
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1137 g10/keygen.c:3215
 msgid "This key is not protected.\n"
 msgstr "Avainta ei ole suojattu.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1145 g10/keygen.c:3218
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1149 g10/keygen.c:3222
 msgid "Key is protected.\n"
 msgstr "Avain on suojattu.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1173
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ei voi muokata avainta: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1179
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3067,11 +3072,11 @@ msgstr ""
 "Syötä uusi salasana salaiselle avaimelle.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1188 g10/keygen.c:1895
 msgid "passphrase not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1193
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3079,206 +3084,206 @@ msgstr ""
 "Et halua salasanaa - tämä on todennäköisesti *huono* ajatus!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1196
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Haluatko varmasti tehdä tämän? "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1267
 msgid "moving a key signature to the correct place\n"
 msgstr "siirretään avaimen allekirjoitus oikealle paikalle\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1353
 msgid "save and quit"
 msgstr "tallenna ja lopeta"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1356
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1357
 msgid "list key and user IDs"
 msgstr "näytä avaimet ja käyttäjätunnukset"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1359
 msgid "select user ID N"
 msgstr "valitse käyttäjätunnus N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1360
 #, fuzzy
 msgid "select subkey N"
 msgstr "valitse käyttäjätunnus N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1361
 #, fuzzy
 msgid "check signatures"
 msgstr "mitätöi allekirjoitus"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1366
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1379
 msgid "add a user ID"
 msgstr "lisää käyttäjätunnus"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1381
 msgid "add a photo ID"
 msgstr "lisää valokuva"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1383
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "poista käyttäjätunnus"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1388
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1392
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1394
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1396
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "poista toissijainen avain"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1402
 msgid "add a revocation key"
 msgstr "lisää mitätöintiavain"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "merkitse käyttäjätunnus ensisijaiseksi"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "vaihda salaisten ja julkisten avainten luettelon välillä"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1413
 msgid "list preferences (expert)"
 msgstr "näytä valinnat (asiantuntija)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1415
 msgid "list preferences (verbose)"
 msgstr "näytä valinnat (monisanaisesti)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "muuta salasanaa"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "muuta luottamusastetta"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "mitätöi käyttäjätunnus"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "mitätöi toissijainen avain"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "ota avain käyttöön"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "poista avain käytöstä"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "näytä valokuvatunniste"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1446
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1564
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "virhe luettaessa salaista avainlohkoa \"%s\": %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1582
 msgid "Secret key is available.\n"
 msgstr "Salainen avain on saatavilla.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1663
 msgid "Need the secret key to do this.\n"
 msgstr "Tähän tarvitaan salainen avain.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1671
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Käytä ensin komentoa \"toggle\".\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1690
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3286,241 +3291,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1730
 msgid "Key is revoked."
 msgstr "Avain on mitätöity."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1749
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1756
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1765
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "tuntematon allekirjoitusluokka"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1788
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
 msgid "You must select at least one user ID.\n"
 msgstr "Sinun täytyy valita ainakin yksi käyttäjätunnus.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1812
 msgid "You can't delete the last user ID!\n"
 msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1814
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Varmastiko poista kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1815
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1865
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1877
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1905
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1960
 msgid "You must select at least one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1963
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Haluatko varmasti poistaa valitut avaimet? "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1964
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Haluatko varmasti poistaa tämän avaimen? "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:1999
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2000
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Varmastiko mitätöi tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2018
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2029
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Haluatko varmasti mitätöidä valitut avaimet? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2081
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2123
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "näytä valinnat"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Varmastiko päivitä valinnat? "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2199
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Tallenna muutokset? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2202
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Lopeta tallentamatta muutoksia?"
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2212
 #, c-format
 msgid "update failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2226
 msgid "Key not changed so no update needed.\n"
 msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2327
 msgid "Digest: "
 msgstr "Tiiviste: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2379
 msgid "Features: "
 msgstr "Ominaisuudet: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2390
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2405 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2413 g10/keyedit.c:2414
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaatio: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2624
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x -muodon käyttäjätunnukselle ei ole valintoja.\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2683
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2704
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2710
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (luottamuksellinen)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keyedit.c:2726 g10/keyedit.c:2782 g10/keyedit.c:2843 g10/keyedit.c:2858
 #: g10/keylist.c:194 g10/keyserver.c:511
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2729 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2731 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2733 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2735
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2754
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2761
 msgid "This key has been disabled"
 msgstr "Tämä avain on poistettu käytöstä"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2789 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2813
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3528,19 +3533,19 @@ 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:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2944
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3548,7 +3553,7 @@ msgstr ""
 "VAROITUS: mitään käyttäjätunnusta ei ole merkitty ensisijaiseksi.  Tämän \n"
 "komennon johdosta eri käyttäjätunnus voi tulla oletetuksi ensisijaiseksi.\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3005
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3557,75 +3562,75 @@ msgstr ""
 "VAROITUS: Tämä on PGP2-muodon avain.  Valokuvan lisääminen voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3351
+#: g10/keyedit.c:3010 g10/keyedit.c:3345
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3016
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Et voi lisätä valokuvaa PGP2-muodon avaimeen.\n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3156
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3166
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3170
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3176
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3190
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d allekirjoitus poistettu.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3191
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d allekirjoitusta poistettu.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3194
 msgid "Nothing deleted.\n"
 msgstr "Mitään ei poistettu.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3227 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "virheellinen ascii-koodaus"
 
-#: g10/keyedit.c:3235
+#: g10/keyedit.c:3229
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:3242
+#: g10/keyedit.c:3236
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3237
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3246
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3340
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3635,374 +3640,374 @@ msgstr ""
 "voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3351
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Et voi lisätä määrättyä mitätöijää PGP 2.x -muodon avaimeen.\n"
 
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3371
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Syötä määrätyn mitätöijän käyttäjätunnus: "
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3396
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x -avainta ei voi nimetä määrätyksi mitätöijäksi\n"
 
-#: g10/keyedit.c:3417
+#: g10/keyedit.c:3411
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "et voi nimittää avainta sen omaksi määrätyksi mitätöijäksi\n"
 
-#: g10/keyedit.c:3439
+#: g10/keyedit.c:3433
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "VAROITUS: Tämän avaimen nimetty mitätöijä on mitätöinyt avaimen!\n"
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3452
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VAROITUS: avaimen nimittämistä määrätyksi mitätöijäksi ei voi perua!\n"
 
-#: g10/keyedit.c:3464
+#: g10/keyedit.c:3458
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): "
 
-#: g10/keyedit.c:3525
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Poista salaisten avainten valinnat, kiitos.\n"
 
-#: g10/keyedit.c:3531
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Valitse korkeintaan yksi toissijainen avain, kiitos.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3538
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3582
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3598
 msgid "No corresponding signature in secret ring\n"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3678
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
 
-#: g10/keyedit.c:3679
+#: g10/keyedit.c:3684
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3841
+#: g10/keyedit.c:3846
 msgid "Please select exactly one user ID.\n"
 msgstr "Valitse tasan yksi käyttäjätunnus!\n"
 
-#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
+#: g10/keyedit.c:3885 g10/keyedit.c:3995 g10/keyedit.c:4115 g10/keyedit.c:4256
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "ohitetaan v3-muodon oma-allekirjoitus käyttäjätunnukselle \"%s\"\n"
 
-#: g10/keyedit.c:4051
+#: g10/keyedit.c:4056
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4131
+#: g10/keyedit.c:4136
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:4132
+#: g10/keyedit.c:4137
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4199
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4348
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ylikirjoita (k/E)? "
 
-#: g10/keyedit.c:4407
+#: g10/keyedit.c:4412
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4470
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4492
+#: g10/keyedit.c:4497
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4627
+#: g10/keyedit.c:4632
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "käyttäjätunnus: \""
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4635 g10/keyedit.c:4699 g10/keyedit.c:4742
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   %08lX allekirjoitti tämän %s%s%s\n"
 
-#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 msgid " (non-exportable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4641
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Tämä allekirjoitus vanheni %s.\n"
 
-#: g10/keyedit.c:4640
+#: g10/keyedit.c:4645
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
 
-#: g10/keyedit.c:4644
+#: g10/keyedit.c:4649
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
 
-#: g10/keyedit.c:4671
+#: g10/keyedit.c:4676
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n"
 
-#: g10/keyedit.c:4697
+#: g10/keyedit.c:4702
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4709
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   %08lX mitätöi tämän %s\n"
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4731
 msgid "You are about to revoke these signatures:\n"
 msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
 
-#: g10/keyedit.c:4746
+#: g10/keyedit.c:4751
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4781
 msgid "no secret key\n"
 msgstr "salainen avain ei ole saatavilla\n"
 
-#: g10/keyedit.c:4846
+#: g10/keyedit.c:4851
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:4863
+#: g10/keyedit.c:4868
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "VAROITUS: käyttäjätunnuksen allekirjoitus on päivätty %d sekuntin päähän "
 "tulevaisuuteen\n"
 
-#: g10/keyedit.c:4927
+#: g10/keyedit.c:4932
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:4989
+#: g10/keyedit.c:4994
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:5084
+#: g10/keyedit.c:5089
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Näytetään valokuva %s, kokoa %ld avaimelle 0x%08lX\n"
 "(käyttäjätunnus %d)\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "valinta %c%lu on kopio\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:876
 msgid "writing direct signature\n"
 msgstr "kirjoitetaan suora allekirjoitus\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:915
 msgid "writing self signature\n"
 msgstr "kirjoitetaan oma-allekirjoitus\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:965
 msgid "writing key binding signature\n"
 msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
+#: g10/keygen.c:2776
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "avaimen koko on pyöristetty %u bittiin\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1331
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1334
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1337
 #, fuzzy
 msgid "Encrypt"
 msgstr "salaa tiedot"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1340
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1348
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1367
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1371
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1376
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1379
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (vain salaus)\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1382
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1385
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1441
 msgid "Please select what kind of key you want:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1443
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA ja ElGamal (oletus)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (vain salaus)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1453
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1522
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-avainparissa on 1024 bittiä.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1532
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1539
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Minkä kokoisen avaimen haluat? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1553
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1559
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Halutun avaimen koko on %u bittiä\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1564 g10/keygen.c:1569
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "pyöristetty %u bittiin\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1618
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4018,7 +4023,7 @@ msgstr ""
 "     <n>m = Avain vanhenee n kuukauden kuluttua\n"
 "     <n>y = Avain vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1629
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4034,40 +4039,40 @@ msgstr ""
 "     <n>m = Allekirjoitus vanhenee n kuukauden kuluttua\n"
 "     <n>y = Allekirjoitus vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Key is valid for? (0) "
 msgstr "Avain on voimassa? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allekirjoitus on voimassa? (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1673
 msgid "invalid value\n"
 msgstr "arvo ei kelpaa\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1680
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1686
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s vanhenee %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1687
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allekirjoitus vanhenee %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1693
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4075,12 +4080,12 @@ msgstr ""
 "Järjestelmäsi ei osaa näyttää päiväyksiä kuin vuoteen 2038.\n"
 "Se kuitenkin käsittelee päiväykset oikein vuoteen 2106.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1698
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Onko tämä oikein (k/e) "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1713
 #, fuzzy
 msgid ""
 "\n"
@@ -4098,44 +4103,44 @@ msgstr ""
 "     \"Matti Meikäläinen (nuorempi) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1726
 msgid "Real name: "
 msgstr "Oikea nimi: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Invalid character in name\n"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei voi alkaa numerolla\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1738
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimen täytyy olla vähintään 5 merkkiä pitkä\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1746
 msgid "Email address: "
 msgstr "Sähköpostiosoite: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1752
 msgid "Not a valid email address\n"
 msgstr "Sähköpostiosoite ei kelpaa\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1760
 msgid "Comment: "
 msgstr "Huomautus: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1766
 msgid "Invalid character in comment\n"
 msgstr "Huomautuksessa on epäkelpo merkki\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1789
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Käytät merkistöä \"%s\".\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1795
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4146,7 +4151,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1800
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
 
@@ -4161,23 +4166,23 @@ msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 msgid "NnCcEeOoQq"
 msgstr "NnHhSsOoLl"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1826
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (L)opeta?"
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (O)k/(L)opeta?"
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:1846
 msgid "Please correct the error first\n"
 msgstr "Ole hyvä ja korjaa ensin virhe\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1886
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4185,12 +4190,12 @@ msgstr ""
 "Tarvitset salasanan suojaamaan salaista avaintasi.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:1896 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1902
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4202,7 +4207,7 @@ msgstr ""
 "tämän ohjelman valitsimella \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:1924
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4214,50 +4219,50 @@ msgstr ""
 "alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
 "paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2722
 msgid "Key generation canceled.\n"
 msgstr "Avaimen luonti keskeytetty.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:2921 g10/keygen.c:3068
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:2923 g10/keygen.c:3071
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:2926 g10/keygen.c:3074
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3057
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3063
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3081
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3088
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3111
 msgid "public and secret key created and signed.\n"
 msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3122
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4266,12 +4271,12 @@ msgstr ""
 "Huomaa, että tätä avainta ei voida käyttää salaamiseen.  Käytä komentoa\n"
 "\"--edit-key\" luodaksesi toissijaisen avaimen salaustarkoitukseen.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4279,7 +4284,7 @@ msgstr ""
 "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4287,26 +4292,26 @@ msgstr ""
 "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3197 g10/keygen.c:3326
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "HUOM: v3-aliavainten luonti ei ole OpenPGP:n mukaista\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3236 g10/keygen.c:3359
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Haluatko varmasti luoda? "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3524
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3571
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3597
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "HUOM: salainen avain %08lX vanheni %s\n"
@@ -4593,213 +4598,217 @@ msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:239
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "outo koko salatulle istuntoavaimelle (%d)\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s-salattu istuntoavain\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:300
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "salattu tuntemattomalla algoritmilla %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:381
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "julkinen avain on %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:438
 msgid "public key encrypted data: good DEK\n"
 msgstr "julkisella avaimella salattu data: DEK kelpaa\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:471
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:475 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:479
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "salattu %s-avaimella, tunnus %08lX\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:493
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "julkisen avaimen avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:507
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "salattu %lu salasanalla\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:509
 msgid "encrypted with 1 passphrase\n"
 msgstr "salattu yhdellä salasanalla\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:540 g10/mainproc.c:562
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "oletettavasti %s-salattua dataa\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:548
 #, 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:581
+#: g10/mainproc.c:580
 msgid "decryption okay\n"
 msgstr "avaus onnistui\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:584
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROITUS: viestin eheyttä ei oltu suojattu\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:597
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROITUS: salattua viestiä on muokattu!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:603
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:624
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "HUOM: lähettäjä määrittää \"vain-sinun-silmillesi\"\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:626
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "alkuperäisen tiedoston nimi=\"%.*s\"\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:711
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr ""
+
+#: g10/mainproc.c:839
 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:1165
+#: g10/mainproc.c:1187
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1430
 msgid "signature verification suppressed\n"
 msgstr "allekirjoituksen varmistus vaiennetaan\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1539
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "näitä allekirjoituksia ei voi käsitellä\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1550
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1555
 #, 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:1544
+#: g10/mainproc.c:1575
 msgid "Key available at: "
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "VÄÄRÄ allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Vanhentunut allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr "[ei tiedossa]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1797
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1895
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1900
 #, 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:1871
+#: g10/mainproc.c:1903
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr "binääri"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr "teksti"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 msgid "unknown"
 msgstr "tuntematon "
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allekirjoitusta ei voi tarkistaa: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
 msgstr "allekirjoitus ei ole erillinen\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:2037
 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:2013
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "epäkelpo juuripaketti havaittu proc_tree():ssä\n"
 
@@ -4938,16 +4947,16 @@ msgstr ""
 msgid "directory `%s' created\n"
 msgstr "%s: hakemisto luotu\n"
 
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:143
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:713
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
 
-#: g10/parse-packet.c:1159
+#: g10/parse-packet.c:1164
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
@@ -5713,12 +5722,12 @@ msgstr ""
 "VAROITUS: käytäntö-url:n %%-laajennus ei onnistu (liian suuri). \n"
 "Käytetään laajentamatonta.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:346
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:355
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s-allekirjoitus lähettäjältä: \"%s\"\n"
@@ -5740,13 +5749,13 @@ msgstr ""
 msgid "signing:"
 msgstr "allekirjoitetaan:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1101
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x -muodon avaimilla voi allekirjoittaa tekstimuotoon \n"
 "vain --pgp2-tilassa\n"
 
-#: g10/sign.c:1278
+#: g10/sign.c:1280
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "käytetään %s-salausta\n"
diff --git a/po/fr.po b/po/fr.po
index 735e709e0..73f0ddc56 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: [email protected]\n"
-"POT-Creation-Date: 2006-12-04 15:05+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2005-06-28 00:24+0200\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -45,10 +45,10 @@ msgstr "�criture de la cl� secr�te dans `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
+#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -83,9 +83,9 @@ 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:481 g10/gpg.c:1008 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
+#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
+#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
@@ -402,14 +402,14 @@ msgstr "la carte OpenPGP n'est pas disponible: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "carte OpenPGP n� %s d�tect�e\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
+#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
+#: g10/keygen.c:1456
 msgid "Your selection? "
 msgstr "Votre choix ? "
 
@@ -579,8 +579,8 @@ msgstr "   (2) Cl� de chiffrement\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cl� d'authentification\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
+#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
@@ -600,7 +600,7 @@ msgstr "Les parties secr�tes de la cl� ne sont pas disponibles.\n"
 msgid "secret key already stored on a card\n"
 msgstr "la cl� secr�te est d�j� stock�e sur une carte\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1319 g10/keyedit.c:1351
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
@@ -608,7 +608,7 @@ msgstr "quitter ce menu"
 msgid "show admin commands"
 msgstr "indiquer les commandes d'administration"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1322 g10/keyedit.c:1354
 msgid "show this help"
 msgstr "afficher cette aide"
 
@@ -662,7 +662,7 @@ msgstr "menu pour changer ou d�verrouiller le PIN"
 msgid "verify the PIN and list all data"
 msgstr "v�rifier le code PIN et lister toutes les donn�es"
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1457 g10/keyedit.c:1617
 msgid "Command> "
 msgstr "Commande> "
 
@@ -678,7 +678,7 @@ msgstr "Les commandes d'administration sont permises\n"
 msgid "Admin commands are not allowed\n"
 msgstr "Les commandes d'administration ne sont pas permises\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1602 g10/keyedit.c:2238
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez �help�)\n"
 
@@ -734,7 +734,7 @@ msgstr "R�p�tez ce code PIN: "
 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:3868 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 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,7 +744,7 @@ 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:3392 g10/keyserver.c:1705
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3386 g10/keyserver.c:1705
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -790,7 +790,7 @@ msgstr "il y a une cl� secr�te pour la cl� publique \"%s\" !\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utiliser l'option �--delete-secret-keys� pour l'effacer d'abord.\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:213 g10/sign.c:1286
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
@@ -867,12 +867,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:91 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:292
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "donn�es chiffr�es avec %s\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:296
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "chiffr� avec l'algorithme inconnu %d\n"
@@ -1019,7 +1019,7 @@ msgstr ""
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENTION: rien n'a �t� export�\n"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:379
 msgid ""
 "@Commands:\n"
 " "
@@ -1027,127 +1027,127 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/gpg.c:380
+#: g10/gpg.c:381
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:383
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "list keys"
 msgstr "lister les cl�s"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:394
 msgid "list keys and signatures"
 msgstr "lister les cl�s et les signatures"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "list and check key signatures"
 msgstr "lister et v�rifier les signatures des cl�s"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "remove keys from the public keyring"
 msgstr "enlever les cl�s du porte-cl�s public"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "remove keys from the secret keyring"
 msgstr "enlever les cl�s du porte-cl�s secret"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "sign a key"
 msgstr "signer une cl�"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "sign a key locally"
 msgstr "signer une cl� localement"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:404
 msgid "sign or edit a key"
 msgstr "signer ou �diter une cl�"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "generate a revocation certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:408
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:409
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "search for keys on a key server"
 msgstr "chercher les cl�s avec un serveur de cl�s"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:413
 msgid "update all keys from a keyserver"
 msgstr "mettre � jour les cl�s depuis un serveur"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:417
 msgid "import/merge keys"
 msgstr "importer/fusionner les cl�s"
 
-#: g10/gpg.c:419
+#: g10/gpg.c:420
 msgid "print the card status"
 msgstr "afficher l'�tat de la carte"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:421
 msgid "change data on a card"
 msgstr "changer les donn�es d'une carte"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:422
 msgid "change a card's PIN"
 msgstr "changer le code PIN d'une carte"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "update the trust database"
 msgstr "mettre la base de confiance � jour"
 
-#: g10/gpg.c:437
+#: g10/gpg.c:438
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/gpg.c:441 g10/gpgv.c:71
+#: g10/gpg.c:442 g10/gpgv.c:70
 msgid ""
 "@\n"
 "Options:\n"
@@ -1157,51 +1157,51 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/gpg.c:445
+#: g10/gpg.c:446
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:458
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/gpg.c:462
+#: g10/gpg.c:463
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:477
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/gpg.c:478 g10/gpgv.c:73
+#: g10/gpg.c:479 g10/gpgv.c:72
 msgid "verbose"
 msgstr "bavard"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:491
 msgid "prompt before overwriting"
 msgstr "demander avant d'�craser un fichier"
 
-#: g10/gpg.c:531
+#: g10/gpg.c:532
 msgid "use strict OpenPGP behavior"
 msgstr "utiliser strictement le comportement OpenPGP"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:533
 msgid "generate PGP 2.x compatible messages"
 msgstr "g�n�rer des messages compatibles avec PGP 2.x"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1209,7 +1209,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
 
-#: g10/gpg.c:564
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1229,17 +1229,17 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/gpg.c:763 g10/gpgv.c:98
+#: g10/gpg.c:766 g10/gpgv.c:97
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Signaler toutes anomalies � <[email protected]> (en anglais)\n"
 "et tout probl�me de traduction � <[email protected]>.\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:783
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1249,7 +1249,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:794
+#: g10/gpg.c:797
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1257,85 +1257,85 @@ msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid "Pubkey: "
 msgstr "Cl� publique: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2310
+#: g10/gpg.c:806 g10/keyedit.c:2304
 msgid "Cipher: "
 msgstr "Chiffrement: "
 
-#: g10/gpg.c:809
+#: g10/gpg.c:812
 msgid "Hash: "
 msgstr "Hachage: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2356
+#: g10/gpg.c:818 g10/keyedit.c:2350
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/gpg.c:898
+#: g10/gpg.c:901
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/gpg.c:1046
+#: g10/gpg.c:1049
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1067
 #, 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:1261
+#: g10/gpg.c:1264
 #, 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:1264
+#: g10/gpg.c:1267
 #, 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:1267
+#: g10/gpg.c:1270
 #, 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:1273
+#: g10/gpg.c:1276
 #, 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:1276
+#: g10/gpg.c:1279
 #, 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:1279
+#: g10/gpg.c:1282
 #, 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:1285
+#: g10/gpg.c:1288
 #, 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:1288
+#: g10/gpg.c:1291
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1343,21 +1343,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:1291
+#: g10/gpg.c:1294
 #, 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:1297
+#: g10/gpg.c:1300
 #, 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:1300
+#: g10/gpg.c:1303
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1365,503 +1365,508 @@ msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
 "fichier de configuration `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, 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:1444
+#: g10/gpg.c:1447
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "�l�ment de configuration `%s' inconnu\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 #, 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:1551
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 #, 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:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/gpg.c:1954
+#: g10/gpg.c:1957
 #, 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:1996
+#: g10/gpg.c:1999
 #, 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:2000
+#: g10/gpg.c:2003
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: g10/gpg.c:2007
+#: g10/gpg.c:2010
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, 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:2236
+#: g10/gpg.c:2239
 #, 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:2402 g10/gpg.c:2414
+#: g10/gpg.c:2405 g10/gpg.c:2417
 #, 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:2491
+#: g10/gpg.c:2494
 #, 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:2515 g10/gpg.c:2702 g10/keyedit.c:4069
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'interpr�ter l'URL du serveur de cl�s\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, 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:2530
+#: g10/gpg.c:2533
 msgid "invalid keyserver options\n"
 msgstr "les options du serveur de cl�s sont invalides\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: options d'import invalides\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "options d'import invalides\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "options d'export invalides\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: options de liste invalides\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 msgid "invalid list options\n"
 msgstr "options de liste invalides\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, 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:2582
+#: g10/gpg.c:2585
 #, 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:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2603
 msgid "invalid verify options\n"
 msgstr "options de v�rification invalides\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2610
 #, 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:2768
+#: g10/gpg.c:2773
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2771
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/gpg.c:2858
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2875
 #, 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:2880
+#: g10/gpg.c:2890
 #, 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:2894
+#: g10/gpg.c:2904
 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:2900
+#: g10/gpg.c:2910
 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:2906
+#: g10/gpg.c:2916
 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:2919
+#: g10/gpg.c:2929
 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:2986 g10/gpg.c:3010
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/gpg.c:2992 g10/gpg.c:3016
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:2998
+#: g10/gpg.c:3008
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de compression s�lectionn� est invalide\n"
 
-#: g10/gpg.c:3004
+#: g10/gpg.c:3014
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "la fonction de hachage de certification s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3029
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3031
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3033
 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:3025
+#: g10/gpg.c:3035
 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:3027
+#: g10/gpg.c:3037
 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:3030
+#: g10/gpg.c:3040
 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:3034
+#: g10/gpg.c:3044
 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:3041
+#: g10/gpg.c:3051
 msgid "invalid default preferences\n"
 msgstr "pr�f�rences par d�faut invalides\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3060
 msgid "invalid personal cipher preferences\n"
 msgstr "pr�f�rences de chiffrement personnelles invalides\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3064
 msgid "invalid personal digest preferences\n"
 msgstr "pr�f�rences de hachage personnelles invalides\n"
 
-#: g10/gpg.c:3058
+#: g10/gpg.c:3068
 msgid "invalid personal compress preferences\n"
 msgstr "pr�f�rences de compression personnelles invalides\n"
 
-#: g10/gpg.c:3091
+#: g10/gpg.c:3101
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne marche pas encore avec %s\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3148
 #, 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:3143
+#: g10/gpg.c:3153
 #, 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:3148
+#: g10/gpg.c:3158
 #, 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:3250
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3271
 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:3272
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3291
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "le chiffrement sym�trique de `%s' a �chou�: %s\n"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3314
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3306
+#: g10/gpg.c:3316
 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:3309
+#: g10/gpg.c:3319
 #, 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:3327
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3365
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3367
 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:3360
+#: g10/gpg.c:3370
 #, 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:3380
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/gpg.c:3426
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/gpg.c:3560
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3572
 #, 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:3564
+#: g10/gpg.c:3574
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'export de la cl� a �chou�: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3585
 #, 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:3585
+#: g10/gpg.c:3595
 #, 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:3636
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/gpg.c:3644
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/gpg.c:3854
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/gpg.c:3858
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4172
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL de politique de certification donn�e est invalide\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4174
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL de politique de signature donn�e est invalide\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4207
 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"
 
@@ -1886,46 +1891,46 @@ msgstr ""
 "La cl� invalide %s a �t� rendue valide par\n"
 "--allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2380 g10/keyedit.c:3712
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, 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:2611
+#: g10/getkey.c:2614
 #, 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:2658
+#: g10/getkey.c:2661
 #, 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"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:73
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "take the keys from this keyring"
 msgstr "enlever les cl�s de ce porte-cl�s"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:76
 msgid "make timestamp conflicts only a warning"
 msgstr ""
 "faire en sorte que les conflits d'horodatage ne soient qu'un\n"
 "avertissement non fatal"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:77
 msgid "|FD|write status info to this FD"
 msgstr "|FD|�crire l'�tat sur ce descripteur"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:101
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Utilisation: gpgv [options] [fichiers] (-h pour l'aide)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:104
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2465,7 +2470,7 @@ msgstr "cl� %s: nouvelle cl� - ignor�e\n"
 msgid "no writable keyring found: %s\n"
 msgstr "aucun porte-cl� n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
@@ -2829,41 +2834,41 @@ msgstr ""
 "Entrez un domaine pour restreindre cette signature, ou bien appuyez\n"
 "sur la touche entr�e pour aucun domaine.\n"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Le nom d'utilisateur \"%s\" est r�voqu�."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
+#: g10/keyedit.c:890 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Etes-vous s�r de toujours vouloir le signer ? (o/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
+#: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  Impossible de signer.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Le nom d'utilisateur \"%s\" est expir�."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Le nom d'utilisateur \"%s\" ne comporte pas d'auto-signature."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Le nom d'utilisateur \"%s\" est susceptible d'�tre sign�.  "
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 msgid "Sign it? (y/N) "
 msgstr "Signer r�ellement ? (o/N) "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2872,11 +2877,11 @@ msgstr ""
 "L'auto-signature de \"%s\"\n"
 "est de style PGP 2.x.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Voulez vous la changer en une auto-signature OpenPGP ? (o/N) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2885,13 +2890,13 @@ msgstr ""
 "Votre signature actuelle de \"%s\"\n"
 "a expir�.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Voulez-vous cr�er une nouvelle signature pour remplacer celle qui a\n"
 "expir� ? (o/N) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2900,43 +2905,43 @@ msgstr ""
 "Votre signature actuelle de \"%s\"\n"
 "est locale.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Voulez vous la rendre compl�tement exportable ? (o/N) "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "� %s � a d�j� �t� sign� localement par la cl� %s\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "� %s � a d�j� �t� sign� par la cl� %s\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voulez-vous vraiment le signer encore une fois ? (o/N) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Rien � signer avec la cl� %s\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Cette cl� a expir� !"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Cette cl� va expirer le %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Voulez-vous que votre signature expire en m�me temps ? (O/n) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:883
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2944,11 +2949,11 @@ msgstr ""
 "il n'est pas possible de g�n�rer une signature OpenPGP d'une cl� de style\n"
 "PGP 2.x en mode --pgp2.\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:885
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Cela rendra la cl� inutilisable par PGP 2.x.\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:910
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2958,31 +2963,31 @@ msgstr ""
 "appartient r�ellement � la personne sus-nomm�e ? Si vous ne savez\n"
 "quoi r�pondre, entrez \"0\".\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Je ne r�pondrai pas.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Je n'ai pas v�rifi� du tout.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) J'ai un peu v�rifi�.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) J'ai v�rifi� tr�s soigneusement.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:927
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Votre s�lection ? (entrer '?' pour plus d'informations): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:951
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2991,92 +2996,92 @@ msgstr ""
 "Etes-vous vraiment s�r(e) que vous voulez signer cette cl�\n"
 "avec votre cl� � %s � (%s)\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:958
 msgid "This will be a self-signature.\n"
 msgstr "Ceci sera une auto-signature.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:964
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "AVERTISSEMENT: la signature ne sera pas marqu�e comme\n"
 "non-exportable.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:972
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "AVERTISSEMENT: La signature ne sera pas marqu�e comme\n"
 "non-r�vocable.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:982
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "La signature sera marqu�e comme non-exportable.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:989
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "La signature sera marqu�e comme non-r�vocable.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:996
 msgid "I have not checked this key at all.\n"
 msgstr "Je n'ai pas du tout v�rifi� cette cl�.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1001
 msgid "I have checked this key casually.\n"
 msgstr "J'ai un peu v�rifi� cette cl�.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1006
 msgid "I have checked this key very carefully.\n"
 msgstr "J'ai v�rifi� cette cl� avec grand soin.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1016
 msgid "Really sign? (y/N) "
 msgstr "Signer r�ellement ? (o/N) "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
-#: g10/keyedit.c:5004 g10/sign.c:352
+#: g10/keyedit.c:1061 g10/keyedit.c:4793 g10/keyedit.c:4884 g10/keyedit.c:4948
+#: g10/keyedit.c:5009 g10/sign.c:351
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1126
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "La cl� poss�de seulement des items partiels ou stock�s sur carte -\n"
 "pas de phrase de passe � changer.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1137 g10/keygen.c:3215
 msgid "This key is not protected.\n"
 msgstr "Cette cl� n'est pas prot�g�e.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parties secr�tes de la cl� principale ne sont pas disponibles.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1145 g10/keygen.c:3218
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr ""
 "Les parties secr�tes de la cl� principale sont stock�es sur la\n"
 "carte.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1149 g10/keygen.c:3222
 msgid "Key is protected.\n"
 msgstr "La cl� est prot�g�e.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1173
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossible d'�diter cette cl�: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1179
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr "Entrez la nouvelle phrase de passe pour cette cl� secr�te.\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1188 g10/keygen.c:1895
 msgid "passphrase not correctly repeated; try again"
 msgstr "la phrase de passe n'a pas �t� correctement r�p�t�e ; recommencez."
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1193
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3085,198 +3090,198 @@ msgstr ""
 "*mauvaise* id�e\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1196
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voulez-vous vraiment faire cela ? (o/N) "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1267
 msgid "moving a key signature to the correct place\n"
 msgstr "replacer la signature d'une cl� � l'endroit correct\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1353
 msgid "save and quit"
 msgstr "enregistrer et quitter"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1356
 msgid "show key fingerprint"
 msgstr "afficher l'empreinte de la cl�"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1357
 msgid "list key and user IDs"
 msgstr "lister la cl� et les noms d'utilisateurs"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1359
 msgid "select user ID N"
 msgstr "s�lectionner le nom d'utilisateur N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1360
 msgid "select subkey N"
 msgstr "s�lectionner la sous-cl� N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1361
 msgid "check signatures"
 msgstr "v�rifier les signatures"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1366
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "signer les noms d'utilisateurs s�lectionn�s [* voir ci-dessous pour\n"
 "les commandes similaires]"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs locally"
 msgstr "signer le nom d'utilisateur s�lectionn� localement"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a trust signature"
 msgstr "signer les noms d'utilisateurs s�lectionn�s localement"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 "signer les noms d'utilisateurs s�lectionn�s avec une signature\n"
 "non-r�vocable"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1379
 msgid "add a user ID"
 msgstr "ajouter un utilisateur"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1381
 msgid "add a photo ID"
 msgstr "ajouter une photo d'identit�"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1383
 msgid "delete selected user IDs"
 msgstr "enlever les noms d'utilisateur s�lectionn�s"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1388
 msgid "add a subkey"
 msgstr "ajouter une sous-cl�"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1392
 msgid "add a key to a smartcard"
 msgstr "ajouter une cl� � une carte � puce"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1394
 msgid "move a key to a smartcard"
 msgstr "d�placer une cl� vers une carte � puce"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1396
 msgid "move a backup key to a smartcard"
 msgstr "d�placer une cl� de sauvegarde vers une carte � puce"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1400
 msgid "delete selected subkeys"
 msgstr "enlever les sous-cl�s s�lectionn�es"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1402
 msgid "add a revocation key"
 msgstr "ajouter une cl� de r�vocation"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1404
 msgid "delete signatures from the selected user IDs"
 msgstr "enlever les signatures des noms d'utilisateur s�lectionn�s "
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1406
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "changer la date d'expiration de la cl� ou des sous-cl�s s�lectionn�es"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1408
 msgid "flag the selected user ID as primary"
 msgstr "marquer le nom d'utilisateur s�lectionn� comme principal"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1410
 msgid "toggle between the secret and public key listings"
 msgstr ""
 "passer de la liste des cl�s secr�tes � celle des cl�s priv�es\n"
 "et inversement"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1413
 msgid "list preferences (expert)"
 msgstr "lister les pr�f�rences (expert)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1415
 msgid "list preferences (verbose)"
 msgstr "lister les pr�f�rences (bavard)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1417
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "indiquer la liste des pr�f�rences pour le nom d'utilisateur\n"
 "s�lectionn�"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "indiquer l'URL du serveur de cl�s pr�f�r� pour les noms d'utilisateur\n"
 "s�lectionn�s"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "indiquer la liste des pr�f�rences pour le nom d'utilisateur\n"
 "s�lectionn�"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "changer la phrase de passe"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "changer la confiance"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1432
 msgid "revoke signatures on the selected user IDs"
 msgstr "r�voquer les signatures des noms d'utilisateur s�lectionn�s"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1434
 msgid "revoke selected user IDs"
 msgstr "r�voquer les noms d'utilisateur s�lectionn�s"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1439
 msgid "revoke key or selected subkeys"
 msgstr "r�voquer la cl� ou les sous-cl�s s�lectionn�es"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1440
 msgid "enable key"
 msgstr "activer la cl�"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1441
 msgid "disable key"
 msgstr "d�sactiver la cl�"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1442
 msgid "show selected photo IDs"
 msgstr "montrer les photos d'identit� s�lectionn�es"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1446
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1564
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erreur pendant la lecture du bloc de cl� secr�te � %s �: %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1582
 msgid "Secret key is available.\n"
 msgstr "La cl� secr�te est disponible.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1663
 msgid "Need the secret key to do this.\n"
 msgstr "Il faut la cl� secr�te pour faire cela.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1671
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Utilisez la commande �toggle� d'abord.\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1690
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3288,158 +3293,158 @@ msgstr ""
 "(tsign), par `nr' pour les signatures non-r�vocables (nrsign), ou\n"
 "bien toute combinaison possible (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1730
 msgid "Key is revoked."
 msgstr "La cl� est r�voqu�e."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1749
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Signer vraiment tous les nom d'utilisateurs ? (o/N) "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1756
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Aide: S�lectionner les utilisateurs � signer\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1765
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Type de signature `%s' inconnu\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1788
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Cette commande n'est pas admise en mode %s.\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
 msgid "You must select at least one user ID.\n"
 msgstr "Vous devez s�lectionner au moins un utilisateur.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1812
 msgid "You can't delete the last user ID!\n"
 msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1814
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Enlever r�ellement tous les noms d'utilisateurs s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1815
 msgid "Really remove this user ID? (y/N) "
 msgstr "Enlever r�ellement ce nom d'utilisateur ? (o/N) "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1865
 msgid "Really move the primary key? (y/N) "
 msgstr "Enlever r�ellement la cl� principale ? (o/N) "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1877
 msgid "You must select exactly one key.\n"
 msgstr "Vous devez s�lectionner exactement une cl�.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1905
 msgid "Command expects a filename argument\n"
 msgstr "La commande attend un nom de fichier comme argument\n"
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1919
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Impossible d'ouvrir `%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1936
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Erreur durant la lecture de la cl� de sauvegarde de `%s' : %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1960
 msgid "You must select at least one key.\n"
 msgstr "Vous devez s�lectionner au moins une cl�.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1963
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voulez-vous vraiment supprimer les cl�s s�lectionn�es ? (o/N) "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1964
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voulez-vous vraiment supprimer cette cl� ? (o/N) "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:1999
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "R�voquer r�ellement tous les noms d'utilisateurs s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2000
 msgid "Really revoke this user ID? (y/N) "
 msgstr "R�voquer r�ellement ce nom d'utilisateur ? (o/N) "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2018
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer la cl� enti�re ? (o/N) "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2029
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer les sous-cl�s s�lectionn�es ? (o/N) "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2031
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer cette sous-cl� ? (o/N) "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2081
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "La confiance du propri�taire peut ne pas �tre positionn�e en utilisant\n"
 "la base de confiance d'un tiers\n"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2123
 msgid "Set preference list to:\n"
 msgstr "Changer la liste de pr�f�rences en :\n"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2129
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Mettre � jour r�ellement les pr�f�rences des noms d'utilisateurs\n"
 "s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2131
 msgid "Really update the preferences? (y/N) "
 msgstr "Faut-il vraiment mettre � jour les pr�f�rences ? (o/N) "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2199
 msgid "Save changes? (y/N) "
 msgstr "Enregistrer les changements? (o/N) "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2202
 msgid "Quit without saving? (y/N) "
 msgstr "Quitter sans enregistrer ? (o/N) "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2212
 #, c-format
 msgid "update failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2226
 msgid "Key not changed so no update needed.\n"
 msgstr "La cl� n'a pas chang� donc la mise � jour est inutile.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2327
 msgid "Digest: "
 msgstr "Hachage: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2379
 msgid "Features: "
 msgstr "Fonctions: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2390
 msgid "Keyserver no-modify"
 msgstr "Serveur de cl�s: pas-de-modification"
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2405 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Serveur de cl�s pr�f�r�: "
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2413 g10/keyedit.c:2414
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3447,73 +3452,73 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2624
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 "Il n'y a pas de pr�f�rences dans un nom d'utilisateur du style de\n"
 "PGP 2.x.\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2683
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Cette cl� a �t� r�voqu�e le %s par la cl� %s %s\n"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2704
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Cette cl� peut �tre r�voqu�e par la cl� %s %s"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2710
 msgid "(sensitive)"
 msgstr "(sensible)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keyedit.c:2726 g10/keyedit.c:2782 g10/keyedit.c:2843 g10/keyedit.c:2858
 #: g10/keylist.c:194 g10/keyserver.c:511
 #, c-format
 msgid "created: %s"
 msgstr "cr��: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2729 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
 #, c-format
 msgid "revoked: %s"
 msgstr "revoqu�: %s"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2731 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "expir�: %s"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2733 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
 #, c-format
 msgid "expires: %s"
 msgstr "expire: %s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2735
 #, c-format
 msgid "usage: %s"
 msgstr "utilisation: %s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2750
 #, c-format
 msgid "trust: %s"
 msgstr " confiance: %s"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2754
 #, c-format
 msgid "validity: %s"
 msgstr "validit�: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2761
 msgid "This key has been disabled"
 msgstr "Cette cl� a �t� d�sactiv�e"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2789 g10/keylist.c:200
 msgid "card-no: "
 msgstr "n� de carte: "
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2813
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3521,17 +3526,17 @@ 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:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "revoqu�e"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "expir�e"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2944
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3540,7 +3545,7 @@ msgstr ""
 "Cette commande risque de rendre un autre nom d'utilisateur principal\n"
 "par d�faut.\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3005
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3550,75 +3555,75 @@ msgstr ""
 "d'identit� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3351
+#: g10/keyedit.c:3010 g10/keyedit.c:3345
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Etes-vous s�r de vouloir l'ajouter ? (y/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3016
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Vous ne pouvez pas ajouter de photo d'identit� � une cl� du style PGP2.\n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3156
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3166
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature invalide ? (o/N/q)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3170
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3176
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3190
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d signature supprim�e.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3191
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d signatures supprim�es\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3194
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a �t� supprim�.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3227 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "invalide"
 
-#: g10/keyedit.c:3235
+#: g10/keyedit.c:3229
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Nom d'utilisateur \"%s\": d�j� nettoy�.\n"
 
-#: g10/keyedit.c:3242
+#: g10/keyedit.c:3236
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "cl� %s: � %s � %d signature nettoy�e\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3237
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "cl� %s: � %s � %d signatures nettoy�es\n"
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Nom d'utilisateur \"%s\": d�j� nettoy�.\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3246
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Nom d'utilisateur \"%s\": d�j� nettoy�.\n"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3340
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3628,375 +3633,375 @@ msgstr ""
 "d�sign� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�.\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3351
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Vous ne pouvez pas ajouter de r�vocateur d�sign� � une cl� de style PGP2.\n"
 
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3371
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Entrez le nom d'utilisateur du r�vocateur d�sign�: "
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3396
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "impossible d'utiliser une cl� de style PGP 2.x comme r�vocateur\n"
 "d�sign�.\n"
 
-#: g10/keyedit.c:3417
+#: g10/keyedit.c:3411
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "vous ne pouvez pas utiliser une cl� comme son propre r�vocateur\n"
 "d�sign�\n"
 
-#: g10/keyedit.c:3439
+#: g10/keyedit.c:3433
 msgid "this key has already been designated as a revoker\n"
 msgstr "cette cl� � d�j� �t� d�sign�e comme un r�vocateur\n"
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3452
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVERTISSEMENT: l'�tablissement d'une cl� comme r�vocateur d�sign�\n"
 "est irr�versible !\n"
 
-#: g10/keyedit.c:3464
+#: g10/keyedit.c:3458
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Etes-vous s�r de vouloir �tablir cette cl� comme r�vocateur\n"
 "d�sign� ? (o/N) "
 
-#: g10/keyedit.c:3525
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
 
-#: g10/keyedit.c:3531
+#: g10/keyedit.c:3526
 msgid "Please select at most one subkey.\n"
 msgstr "Vous devez s�lectionner au plus une sous-cl�.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3530
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Changer la date d'expiration d'une sous-cl�.\n"
 
-#: g10/keyedit.c:3538
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la cl� principale.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3582
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vous ne pouvez pas changer la date d'expiration d'une cl� v3\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3598
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3678
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVERTISSEMENT: la sous-cl� de signature %s n'a pas de certificat\n"
 "crois�\n"
 
-#: g10/keyedit.c:3679
+#: g10/keyedit.c:3684
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3841
+#: g10/keyedit.c:3846
 msgid "Please select exactly one user ID.\n"
 msgstr "Vous devez s�lectionner exactement un utilisateur.\n"
 
-#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
+#: g10/keyedit.c:3885 g10/keyedit.c:3995 g10/keyedit.c:4115 g10/keyedit.c:4256
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "l'auto-signature v3 du nom d'utilisateur � %s � a �t� ignor�e\n"
 
-#: g10/keyedit.c:4051
+#: g10/keyedit.c:4056
 msgid "Enter your preferred keyserver URL: "
 msgstr "Entrez l'URL de votre serveur de cl�s favori: "
 
-#: g10/keyedit.c:4131
+#: g10/keyedit.c:4136
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Etes-vous s�r de vouloir le remplacer ? (o/N) "
 
-#: g10/keyedit.c:4132
+#: g10/keyedit.c:4137
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Etes-vous s�r de vouloir le supprimer ? (o/N) "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4199
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notation de signature: "
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4348
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "R��crire par-dessus ? (o/N) "
 
-#: g10/keyedit.c:4407
+#: g10/keyedit.c:4412
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4470
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Pas de nom d'utilisateur avec le hachage %s\n"
 
-#: g10/keyedit.c:4492
+#: g10/keyedit.c:4497
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Pas de sous-cl� avec l'index %d\n"
 
-#: g10/keyedit.c:4627
+#: g10/keyedit.c:4632
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "nom d'utilisateur: � %s �\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4635 g10/keyedit.c:4699 g10/keyedit.c:4742
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "sign� par votre cl� %s � %s%s%s\n"
 
-#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4641
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Cette signature a expir� le %s.\n"
 
-#: g10/keyedit.c:4640
+#: g10/keyedit.c:4645
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Etes-vous s�r de vouloir toujours le r�voquer ? (y/N) "
 
-#: g10/keyedit.c:4644
+#: g10/keyedit.c:4649
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "G�n�rer un certificat de r�vocation pour cette signature ? (o/N) "
 
-#: g10/keyedit.c:4671
+#: g10/keyedit.c:4676
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vous avez sign� ces noms d'utilisateurs sur la cl� %s:\n"
 
-#: g10/keyedit.c:4697
+#: g10/keyedit.c:4702
 msgid " (non-revocable)"
 msgstr " (non-r�vocable)"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4709
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "r�voqu� par votre cl� %s � %s\n"
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4731
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous �tes sur le point de r�voquer ces signatures:\n"
 
-#: g10/keyedit.c:4746
+#: g10/keyedit.c:4751
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Cr�er r�ellement les certificats de r�vocation ? (o/N) "
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4781
 msgid "no secret key\n"
 msgstr "pas de cl� secr�te\n"
 
-#: g10/keyedit.c:4846
+#: g10/keyedit.c:4851
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Le nom d'utilisateur \"%s\" est d�j� r�voqu�.\n"
 
-#: g10/keyedit.c:4863
+#: g10/keyedit.c:4868
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVERTISSEMENT: une signature de nom d'utilisateur date de %d secondes\n"
 "dans le futur\n"
 
-#: g10/keyedit.c:4927
+#: g10/keyedit.c:4932
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La cl� %s est d�j� r�voqu�.\n"
 
-#: g10/keyedit.c:4989
+#: g10/keyedit.c:4994
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La sous-cl� %s est d�j� r�voqu�e.\n"
 
-#: g10/keyedit.c:5084
+#: g10/keyedit.c:5089
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Affichage %s photo d'identit� de taille %ld pour la cl�\n"
 "0x%s (uid %d)\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "pr�f�rence `%s' dupliqu�e\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 msgid "too many cipher preferences\n"
 msgstr "trop de pr�f�rences de chiffrement\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 msgid "too many digest preferences\n"
 msgstr "trop de pr�f�rences de hachage\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 msgid "too many compression preferences\n"
 msgstr "trop de pr�f�rences de compression\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "�l�ment `%s' invalide dans la cha�ne de pr�f�rences\n"
 
 # g10/keygen.c:123 ???
-#: g10/keygen.c:872
+#: g10/keygen.c:876
 msgid "writing direct signature\n"
 msgstr "�criture de la signature directe\n"
 
 # g10/keygen.c:123 ???
-#: g10/keygen.c:911
+#: g10/keygen.c:915
 msgid "writing self signature\n"
 msgstr "�criture de l'auto-signature\n"
 
 # g10/keygen.c:161 ???
-#: g10/keygen.c:961
+#: g10/keygen.c:965
 msgid "writing key binding signature\n"
 msgstr "�criture de la signature de liaison\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
+#: g10/keygen.c:2776
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Taille invalide; utilisation de %u bits\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie � %u bits\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1331
 msgid "Sign"
 msgstr "Signer"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1334
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1337
 msgid "Encrypt"
 msgstr "Chiffrer"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1340
 msgid "Authenticate"
 msgstr "Authentifier"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1348
 msgid "SsEeAaQq"
 msgstr "SsCcAaQq"
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1367
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Actions possibles pour une cl� %s: "
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1371
 msgid "Current allowed actions: "
 msgstr "Actions actuellement permises: "
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1376
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Inverser la capacit� de signer\n"
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1379
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Inverser la capacit� de chiffrement\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1382
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Inverser la capacit� d'authentifier\n"
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1385
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Termin�\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1441
 msgid "Please select what kind of key you want:\n"
 msgstr "S�lectionnez le type de cl� d�sir�:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1443
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA et Elgamal (par d�faut)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signature seule)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1446
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (indiquez vous-m�me les capacit�s)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1448
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (chiffrement seul)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (signature seule)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (chiffrement seul)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1453
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (indiquez vous-m�me les capacit�s)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1522
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "La paire de cl�s DSA fera %u bits.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1532
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "les cl�s %s peuvent faire entre %u et %u bits de longueur.\n"
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1539
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Quelle taille de cl� d�sirez-vous ? (%u) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1553
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "les tailles de cl�s %s doivent �tre dans l'intervalle %u-%u\n"
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1559
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La taille demand�e est %u bits\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1564 g10/keygen.c:1569
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie � %u bits\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1618
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4012,7 +4017,7 @@ msgstr ""
 "      <n>m = la cl� expire dans n mois\n"
 "      <n>y = la cl� expire dans n ann�es\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1629
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4028,38 +4033,38 @@ msgstr ""
 "      <n>m = la signature expire dans n mois\n"
 "      <n>y = la signature expire dans n ann�es\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Key is valid for? (0) "
 msgstr "La cl� est valide pour ? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1655
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "La signature est valide pour ? (%s) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1673
 msgid "invalid value\n"
 msgstr "valeur invalide\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1680
 msgid "Key does not expire at all\n"
 msgstr "La cl� n'expire pas du tout\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Signature does not expire at all\n"
 msgstr "La signature n'expire pas du tout\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1686
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La cl� expire le %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1687
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1693
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4067,11 +4072,11 @@ msgstr ""
 "Votre syst�me ne sait pas afficher les dates au-del� de 2038.\n"
 "Cependant la gestion des dates sera correcte jusqu'� 2106.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1698
 msgid "Is this correct? (y/N) "
 msgstr "Est-ce correct ? (o/N) "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1713
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4087,44 +4092,44 @@ msgstr ""
 "   � Heinrich Heine (Der Dichter) <[email protected]> �\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1726
 msgid "Real name: "
 msgstr "Nom r�el: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Invalid character in name\n"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1738
 msgid "Name must be at least 5 characters long\n"
 msgstr "Le nom doit faire au moins 5 caract�res de long\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1746
 msgid "Email address: "
 msgstr "Adresse e-mail: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1752
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1760
 msgid "Comment: "
 msgstr "Commentaire: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1766
 msgid "Invalid character in comment\n"
 msgstr "Caract�re invalide dans le commentaire\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1789
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vous utilisez le jeu de caract�res '%s'.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1795
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4135,7 +4140,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1800
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Ne mettez pas d'adresse e-mail dans le nom r�el ou dans le commentaire\n"
@@ -4151,23 +4156,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1826
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (Q)uitter ? "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (O)K/(Q)uitter ? "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:1846
 msgid "Please correct the error first\n"
 msgstr "Corrigez l'erreur d'abord\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1886
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4176,12 +4181,12 @@ msgstr ""
 "secr�te.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:1896 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1902
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4195,7 +4200,7 @@ msgstr ""
 "� --edit-key �.\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:1924
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4207,52 +4212,52 @@ msgstr ""
 "pendant la g�n�ration de nombres premiers; cela donne au g�n�rateur de\n"
 "nombres al�atoires une meilleure chance d'avoir assez d'entropie.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2722
 msgid "Key generation canceled.\n"
 msgstr "La g�n�ration de cl� a �t� annul�e.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:2921 g10/keygen.c:3068
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�criture de la cl� publique dans `%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:2923 g10/keygen.c:3071
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "�criture d'une cl� secr�te partielle dans `%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:2926 g10/keygen.c:3074
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�criture de la cl� secr�te dans `%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3057
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr ""
 "aucun portes-cl�s public n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3063
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 "aucun portes-cl�s secret n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3081
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s public `%s': %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3088
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s secret `%s': %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3111
 msgid "public and secret key created and signed.\n"
 msgstr "les cl�s publique et secr�te ont �t� cr��es et sign�es.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3122
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4261,13 +4266,13 @@ msgstr ""
 "utiliser la commande �--edit-key� pour g�n�rer une sous-cl� �\n"
 "cette fin.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La g�n�ration de cl� a �chou�: %s\n"
 
 # on s'amuse comme on peut...
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4275,7 +4280,7 @@ msgstr ""
 "la cl� a �t� cr��e %lu seconde dans le futur (rupture spatio-temporelle ou\n"
 "probl�me d'horloge)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4283,26 +4288,26 @@ msgstr ""
 "la cl� a �t� cr��e %lu secondes dans le futur (rupture spatio-temporelle ou\n"
 "probl�me d'horloge\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3197 g10/keygen.c:3326
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "NOTE: cr�er des sous-cl�s pour des cl�s v3 n'est pas conforme � OpenPGP\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3236 g10/keygen.c:3359
 msgid "Really create? (y/N) "
 msgstr "Cr�er vraiment ? (o/N) "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3524
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "le stockage de la cl� dans la carte a �chou�: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3571
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "impossible de cr�er le fichier de sauvegarde `%s': %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3597
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTE: sauvegarde de la cl� de la carte dans `%s'\n"
@@ -4594,195 +4599,199 @@ msgstr ""
 "AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
 "via %s: %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:239
 #, 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:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "cl� de session chiffr�e %s\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:300
 #, 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:382
+#: g10/mainproc.c:381
 #, c-format
 msgid "public key is %s\n"
 msgstr "la cl� publique est %s\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:438
 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:472
+#: g10/mainproc.c:471
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:475 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      � %s �\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:479
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "chiffr� avec une cl� %s, ID %s\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:493
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "le d�chiffrement par cl� publique a �chou�: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:507
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "chiffr� avec %lu phrases de passe\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:509
 msgid "encrypted with 1 passphrase\n"
 msgstr "chiffr� avec 1 phrase de passe\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:540 g10/mainproc.c:562
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "on suppose des donn�es chiffr�es avec %s\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:548
 #, 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:581
+#: g10/mainproc.c:580
 msgid "decryption okay\n"
 msgstr "le d�chiffrement a r�ussi\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:584
 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:598
+#: g10/mainproc.c:597
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTISSEMENT: le message chiffr� a �t� manipul� !\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:603
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "le d�chiffrement a �chou�: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:624
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE: l'exp�diteur a demand� �pour vos yeux seulement�\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:626
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original: '%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:711
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr ""
+
+#: g10/mainproc.c:839
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "r�vocation autonome - utilisez �gpg --import� pour l'appliquer\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1187
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Bonne signature de � %s �"
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1430
 msgid "signature verification suppressed\n"
 msgstr "v�rification de signature supprim�e\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1539
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "le traitement de ces signatures multiples est impossible\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1550
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature faite le %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1551
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               en utilisant la cl� %s %s\n"
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1555
 #, 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:1544
+#: g10/mainproc.c:1575
 msgid "Key available at: "
 msgstr "Cl� disponible sur: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MAUVAISE signature de � %s �"
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature expir�e de � %s �"
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bonne signature de � %s �"
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr "[incertain]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1797
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias � %s �"
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1895
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "La signature a expir� le %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1900
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1903
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "signature %s, algorithme de hachage %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr "binaire"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr "modetexte"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 msgid "unknown"
 msgstr "inconnu"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de v�rifier la signature: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
 msgstr "la signature n'est pas d�tach�e\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:2037
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
@@ -4790,16 +4799,16 @@ msgstr ""
 "premi�re\n"
 "sera v�rifi�e.\n"
 
-#: g10/mainproc.c:2013
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
@@ -4941,18 +4950,18 @@ msgstr ""
 msgid "directory `%s' created\n"
 msgstr "r�pertoire `%s' cr��\n"
 
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:143
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossible de g�rer l'algorithme � cl� publique %d\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:713
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVERISSEMENT: la cl� de session chiffr�e de mani�re sym�trique est\n"
 "potentiellement non s�re\n"
 
-#: g10/parse-packet.c:1159
+#: g10/parse-packet.c:1164
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un sous-paquet de type %d poss�de un bit critique\n"
@@ -5722,12 +5731,12 @@ msgstr ""
 "AVERTISSEMENT: impossible de faire une expansion � base de %% de l'URL\n"
 "de politique (trop grande). Utilisation de la version non expans�e.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:346
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Impossible de v�rifier la signature cr��e: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:355
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signature de: � %s �\n"
@@ -5750,13 +5759,13 @@ msgstr ""
 msgid "signing:"
 msgstr "signature:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1101
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible de faire une signature en texte clair avec des cl�s\n"
 "de style PGP 2.x qu'en mode --pgp2\n"
 
-#: g10/sign.c:1278
+#: g10/sign.c:1280
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "le chiffrement %s sera utilis�\n"
diff --git a/po/gl.po b/po/gl.po
index 5e19f1b8e..19aa6cc17 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: [email protected]\n"
-"POT-Creation-Date: 2006-12-04 15:05+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <[email protected]>\n"
 "Language-Team: Galician <[email protected]>\n"
@@ -40,10 +40,10 @@ msgstr "gravando a chave secreta en `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
+#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -76,9 +76,9 @@ 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:481 g10/gpg.c:1008 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
+#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
+#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
@@ -395,15 +395,15 @@ msgstr "a chave secreta non est� dispo�ible"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
+#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "non se pode facer iso no modo por lotes\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
+#: g10/keygen.c:1456
 msgid "Your selection? "
 msgstr "�A s�a selecci�n? "
 
@@ -581,8 +581,8 @@ msgstr "   (%d) RSA (s� cifrar)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
+#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Selecci�n non v�lida.\n"
 
@@ -606,7 +606,7 @@ msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 msgid "secret key already stored on a card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1319 g10/keyedit.c:1351
 msgid "quit this menu"
 msgstr "sa�r deste men�"
 
@@ -615,7 +615,7 @@ msgstr "sa�r deste men�"
 msgid "show admin commands"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1322 g10/keyedit.c:1354
 msgid "show this help"
 msgstr "amosar esta axuda"
 
@@ -672,7 +672,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1457 g10/keyedit.c:1617
 msgid "Command> "
 msgstr "Comando> "
 
@@ -691,7 +691,7 @@ msgstr "comandos conflictivos\n"
 msgid "Admin commands are not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1602 g10/keyedit.c:2238
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
@@ -749,7 +749,7 @@ msgstr "Repita o contrasinal: "
 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:3868 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -759,7 +759,7 @@ 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:3392 g10/keyserver.c:1705
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3386 g10/keyserver.c:1705
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -809,7 +809,7 @@ msgstr "�hai unha chave secreta para a chave p�blica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "empregue a opci�n \"--delete-secret-keys\" para borrala primeiro.\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:213 g10/sign.c:1286
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
@@ -881,12 +881,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:91 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:292
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados con %s\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:296
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado cun algoritmo desco�ecido %d\n"
@@ -1030,7 +1030,7 @@ msgstr ""
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: non se exportou nada\n"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:379
 msgid ""
 "@Commands:\n"
 " "
@@ -1038,128 +1038,128 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:380
+#: g10/gpg.c:381
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|facer unha sinatura"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:383
 msgid "make a detached signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "encrypt data"
 msgstr "cifrar datos"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar s� con cifrado sim�trico"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "decrypt data (default)"
 msgstr "descifrar datos (por defecto)"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "verify a signature"
 msgstr "verificar unha sinatura"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "list keys"
 msgstr "ve-la lista de chaves"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:394
 msgid "list keys and signatures"
 msgstr "ve-la lista de chaves e sinaturas"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "list keys and fingerprints"
 msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "list secret keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "remove keys from the public keyring"
 msgstr "borrar chaves do chaveiro p�blico"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "remove keys from the secret keyring"
 msgstr "borrar chaves do chaveiro secreto"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "sign a key"
 msgstr "asinar unha chave"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:404
 msgid "sign or edit a key"
 msgstr "asinar ou editar unha chave"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "generate a revocation certificate"
 msgstr "xerar un certificado de revocaci�n"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:408
 msgid "export keys to a key server"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:409
 msgid "import keys from a key server"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "search for keys on a key server"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:413
 msgid "update all keys from a keyserver"
 msgstr "actualizar t�dalas chaves dun servidor de chaves"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:417
 msgid "import/merge keys"
 msgstr "importar/mesturar chaves"
 
-#: g10/gpg.c:419
+#: g10/gpg.c:420
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:421
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:422
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "update the trust database"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/gpg.c:437
+#: g10/gpg.c:438
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/gpg.c:441 g10/gpgv.c:71
+#: g10/gpg.c:442 g10/gpgv.c:70
 msgid ""
 "@\n"
 "Options:\n"
@@ -1169,51 +1169,51 @@ msgstr ""
 "Opci�ns:\n"
 " "
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "create ascii armored output"
 msgstr "crear sa�da con armadura en ascii"
 
-#: g10/gpg.c:445
+#: g10/gpg.c:446
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "use this user-id to sign or decrypt"
 msgstr "empregar este id de usuario para asinar ou descifrar"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:458
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|axusta-lo nivel de compresi�n a N (0 desactiva)"
 
-#: g10/gpg.c:462
+#: g10/gpg.c:463
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:477
 msgid "use as output file"
 msgstr "usar coma ficheiro de sa�da"
 
-#: g10/gpg.c:478 g10/gpgv.c:73
+#: g10/gpg.c:479 g10/gpgv.c:72
 msgid "verbose"
 msgstr "lareto"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "do not make any changes"
 msgstr "non facer ning�n cambio"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:491
 msgid "prompt before overwriting"
 msgstr "avisar antes de sobrescribir"
 
-#: g10/gpg.c:531
+#: g10/gpg.c:532
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:532
+#: g10/gpg.c:533
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1221,7 +1221,7 @@ msgstr ""
 "@\n"
 "(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
 
-#: g10/gpg.c:564
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1241,17 +1241,17 @@ msgstr ""
 " --list-keys [nomes]        amosa-las chaves\n"
 " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
 
-#: g10/gpg.c:763 g10/gpgv.c:98
+#: g10/gpg.c:766 g10/gpgv.c:97
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Por favor, informe dos erros no programa a <[email protected]>,\n"
 "e dos erros na traducci�n a <[email protected]>.\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:783
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1261,7 +1261,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: g10/gpg.c:794
+#: g10/gpg.c:797
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1269,580 +1269,585 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid "Pubkey: "
 msgstr "P�blica: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2310
+#: g10/gpg.c:806 g10/keyedit.c:2304
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:809
+#: g10/gpg.c:812
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2356
+#: g10/gpg.c:818 g10/keyedit.c:2350
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/gpg.c:898
+#: g10/gpg.c:901
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: g10/gpg.c:1046
+#: g10/gpg.c:1049
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1067
 #, 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:1261
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1288
 #, 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:1288
+#: g10/gpg.c:1291
 #, 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:1291
+#: g10/gpg.c:1294
 #, 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:1297
+#: g10/gpg.c:1300
 #, 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:1300
+#: g10/gpg.c:1303
 #, 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:1303
+#: g10/gpg.c:1306
 #, 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:1444
+#: g10/gpg.c:1447
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "amosar en que chaveiro est� unha chave listada"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1954
+#: g10/gpg.c:1957
 #, 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:1996
+#: g10/gpg.c:1999
 #, 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:2000
+#: g10/gpg.c:2003
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: g10/gpg.c:2007
+#: g10/gpg.c:2010
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s non � para uso normal!\n"
 
-#: g10/gpg.c:2236
+#: g10/gpg.c:2239
 #, 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:2402 g10/gpg.c:2414
+#: g10/gpg.c:2405 g10/gpg.c:2417
 #, 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:2491
+#: g10/gpg.c:2494
 #, 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:2515 g10/gpg.c:2702 g10/keyedit.c:4069
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, 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:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, 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:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "%s non � un xogo de caracteres v�lido\n"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2600
 #, 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:2598
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/gpg.c:2768
+#: g10/gpg.c:2773
 #, 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:2771
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: g10/gpg.c:2858
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2875
 #, 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:2880
+#: g10/gpg.c:2890
 #, 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:2894
+#: g10/gpg.c:2904
 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:2900
+#: g10/gpg.c:2910
 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:2906
+#: g10/gpg.c:2916
 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:2919
+#: g10/gpg.c:2929
 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:2986 g10/gpg.c:3010
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:2992 g10/gpg.c:3016
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/gpg.c:2998
+#: g10/gpg.c:3008
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3004
+#: g10/gpg.c:3014
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3029
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3031
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3033
 #, 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:3025
+#: g10/gpg.c:3035
 #, 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:3027
+#: g10/gpg.c:3037
 #, 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:3030
+#: g10/gpg.c:3040
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3044
 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:3041
+#: g10/gpg.c:3051
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non v�lidas\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3060
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non v�lidas\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3064
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non v�lidas\n"
 
-#: g10/gpg.c:3058
+#: g10/gpg.c:3068
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresi�n personais non v�lidas\n"
 
-#: g10/gpg.c:3091
+#: g10/gpg.c:3101
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�%s a�nda non traballa con %s!\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3148
 #, 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:3143
+#: g10/gpg.c:3153
 #, 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:3148
+#: g10/gpg.c:3158
 #, 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:3250
+#: g10/gpg.c:3260
 #, 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:3261
+#: g10/gpg.c:3271
 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:3272
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3291
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3314
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3306
+#: g10/gpg.c:3316
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3319
 #, 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:3327
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3365
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3367
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3370
 #, 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:3380
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/gpg.c:3426
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]"
 
-#: g10/gpg.c:3560
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3572
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3564
+#: g10/gpg.c:3574
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportaci�n da chave fallou: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3585
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3595
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/gpg.c:3644
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: g10/gpg.c:3854
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/gpg.c:3858
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a s�a mensaxe ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4172
 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:4164
+#: g10/gpg.c:4174
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4207
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
@@ -1868,43 +1873,43 @@ 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:2380 g10/keyedit.c:3712
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, 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:2611
+#: g10/getkey.c:2614
 #, 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:2658
+#: g10/getkey.c:2661
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sen chave p�blica - omitida\n"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:73
 msgid "be somewhat more quiet"
 msgstr "ser un pouqui�o m�is calado"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "take the keys from this keyring"
 msgstr "toma-las chaves deste chaveiro"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:76
 msgid "make timestamp conflicts only a warning"
 msgstr "converte-los conflictos de selo de data nun aviso"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:77
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribi-la informaci�n de estado a este DF"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:101
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:104
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2426,7 +2431,7 @@ msgstr "chave %08lX: nova chave - omitida\n"
 msgid "no writable keyring found: %s\n"
 msgstr "non se atopou un chaveiro no que se poida escribir: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribindo a `%s'\n"
@@ -2794,42 +2799,42 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
+#: g10/keyedit.c:890 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Est� seguro de que quere asinalo? (s/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
+#: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr " Non se puido asinar.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "O ID de usuario \"%s\" est� caducado."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "O ID de usuario \"%s\" non est� asinado por el mesmo."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "O ID de usuario \"%s\" non est� asinado por el mesmo."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "�Asinar de verdade? "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2838,11 +2843,11 @@ msgstr ""
 "A auto-sinatura de \"%s\"\n"
 "� unha sinatura tipo PGP 2.x\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "�Quere promovela a unha auto-sinatura OpenPGP? (s/N) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2851,11 +2856,11 @@ msgstr ""
 "A s�a sinatura actual en \"%s\"\n"
 "caducou.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�Quere emitir unha nova sinatura que substit�a � caducada? (s/N) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2864,54 +2869,54 @@ msgstr ""
 "A s�a sinatura actual en \"%s\"\n"
 "� unha sinatura local.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "�Quere promovela a sinatura totalmente exportable? (s/N) "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" xa estaba asinado localmente coa chave %08lX\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" xa estaba asinado coa chave %08lX\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "�Quere asinalo outra vez de t�dolos xeitos? (s/N) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada que asinar coa chave %08lX\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "�Esta chave caducou!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave ha caducar o %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�Quere que a s�a sinatura caduque ao mesmo tempo? (S/n) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:883
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Non pode facer unha sinatura OpenPGP nunha chave PGP 2.x no modo --pgp2.\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:885
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Isto poder�a face-la chave non utilizable en PGP 2.x.\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:910
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2920,32 +2925,32 @@ msgstr ""
 "�Con canto tino comprobou que a chave que vai asinar realmente pertence �\n"
 "persoa de enriba? Se non sabe que respostar, introduza \"0\".\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Non hei respostar.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Non o comprobei en absoluto.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Fixen algunhas comprobaci�ns.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Fixen comprobaci�ns moi exhaustivas.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:927
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "�A s�a elecci�n? (introduza '?' para ter m�is informaci�n): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:951
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2954,100 +2959,100 @@ msgstr ""
 "�Esta seguro de que quere asinar esta chave\n"
 "coa s�a chave: \""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:958
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Esta ha ser unha auto-sinatura.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "AVISO: a sinatura non se ha marcar coma non exportable.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:972
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "AVISO: A sinatura non se ha marcar coma non revocable.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:982
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "A sinatura hase marcar coma non exportable.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:989
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "A sinatura hase marcar coma non revocable.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Non se comprobou esta chave en absoluto.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1001
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Comprobouse esta chave de xeito informal.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1006
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Comprobouse esta chave con moito tino.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1016
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "�Asinar de verdade? "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
-#: g10/keyedit.c:5004 g10/sign.c:352
+#: g10/keyedit.c:1061 g10/keyedit.c:4793 g10/keyedit.c:4884 g10/keyedit.c:4948
+#: g10/keyedit.c:5009 g10/sign.c:351
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1126
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1137 g10/keygen.c:3215
 msgid "This key is not protected.\n"
 msgstr "Esta chave non est� protexida.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1145 g10/keygen.c:3218
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1149 g10/keygen.c:3222
 msgid "Key is protected.\n"
 msgstr "A chave est� protexida.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1173
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Non se pode editar esta chave: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1179
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3055,11 +3060,11 @@ msgstr ""
 "Introduza o novo contrasinal para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1188 g10/keygen.c:1895
 msgid "passphrase not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1193
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3067,212 +3072,212 @@ msgstr ""
 "Non desexa un contrainal - �o que � unha *mala* idea!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1196
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "�Seguro que quere facer esto? "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1267
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a sinatura dunha chave � seu sitio\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1353
 msgid "save and quit"
 msgstr "gardar e sa�r"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1356
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1357
 msgid "list key and user IDs"
 msgstr "listar chave e IDs de usuario"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1359
 msgid "select user ID N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1360
 #, fuzzy
 msgid "select subkey N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1361
 #, fuzzy
 msgid "check signatures"
 msgstr "revocar sinaturas"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1366
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "asina-la chave localmente"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1379
 msgid "add a user ID"
 msgstr "engadir un ID de usuario"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1381
 msgid "add a photo ID"
 msgstr "engadir unha identificaci�n fotogr�fica"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1383
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "borrar un ID de usuario"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1388
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1392
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1394
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1396
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "borrar unha chave secundaria"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1402
 msgid "add a revocation key"
 msgstr "engadir unha chave de revocaci�n"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Non pode cambia-la data de expiraci�n dunha chave v3\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marcar un ID de usuario coma primario"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "cambiar entre o listado de chaves p�blicas e secretas"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1413
 msgid "list preferences (expert)"
 msgstr "lista-las preferencias (expertos)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1415
 msgid "list preferences (verbose)"
 msgstr "lista-las preferencias (moitos datos)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revocar un ID de usuario"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revocar unha chave secundaria"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "habilitar unha chave"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "deshabilitar unha chave"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "amosa-la identificaci�n fotogr�fica"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1446
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1564
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erro ao le-lo bloque de chave secreta `%s': %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1582
 msgid "Secret key is available.\n"
 msgstr "A chave secreta est� disponible.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1663
 msgid "Need the secret key to do this.\n"
 msgstr "C�mpre a chave secreta para facer isto.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1671
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor, empregue o comando \"toggle\" antes.\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1690
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3280,243 +3285,243 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1730
 msgid "Key is revoked."
 msgstr "A chave est� revocada."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1749
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�Seguro de que quere asinar t�dolos IDs de usuario? "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1756
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1765
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "clase de sinatura desco�ecida"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1788
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Non se admite este comando no modo %s.\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar alomenos un ID de usuario.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1812
 msgid "You can't delete the last user ID!\n"
 msgstr "�Non pode borra-lo �ltimo ID de usuario!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1814
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�Seguro de que quere borrar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1815
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "�Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1865
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "�Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1877
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1905
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1960
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1963
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�Seguro de que quere borra-las chaves seleccionadas? "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1964
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�Seguro de que quere borrar esta chave? "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:1999
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2000
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�Seguro de que quere revocar este ID de usuario? "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2018
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "�Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2029
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�Realmente quere revoca-las chaves seleccionadas? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2081
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2123
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "estabrece-la lista de preferencias"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "�Realmente desexa actualiza-las preferencias? "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2199
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�Garda-los cambios? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2202
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�Sa�r sin gardar? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2212
 #, c-format
 msgid "update failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "o segredo da actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2226
 msgid "Key not changed so no update needed.\n"
 msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2327
 msgid "Digest: "
 msgstr "Resumo: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2379
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2390
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2405 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2413 g10/keyedit.c:2414
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaci�n: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2624
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Non hai preferencias nun ID de usuario estilo PGP 2.x.\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2683
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Esta chave pode estar revocada por %s chave "
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2704
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta chave pode estar revocada por %s chave "
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2710
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keyedit.c:2726 g10/keyedit.c:2782 g10/keyedit.c:2843 g10/keyedit.c:2858
 #: g10/keylist.c:194 g10/keyserver.c:511
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "non foi posible crear %s: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2729 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2731 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2733 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2735
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2754
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2761
 msgid "This key has been disabled"
 msgstr "Esta chave est� desactivada"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2789 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2813
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3524,19 +3529,19 @@ 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:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2944
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3544,7 +3549,7 @@ msgstr ""
 "AVISO: non se marcou ning�n ID de usuario coma primario. Esta orde pode\n"
 "              facer que un ID de usuario diferente se converta no primario.\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3005
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3553,77 +3558,77 @@ msgstr ""
 "AVISO: Esta � unha chave de estilo PGP2. Se engade unha identificaci�n\n"
 "       fotogr�fica algunhas versi�ns de PGP han rexeitar esta chave.\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3351
+#: g10/keyedit.c:3010 g10/keyedit.c:3345
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de que quere engadila? (s/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3016
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Non pode engadir unha identificaci�n fotogr�fica a unha chave de estilo "
 "PGP2.\n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3156
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta sinatura correcta? (s/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3166
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta sinatura incorrecta? (s/N/q)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3170
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta sinatura desco�ecida? (s/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3176
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Realmente quere borrar esta auto-sinatura? (s/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3190
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Borrada %d sinatura.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3191
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Borradas %d sinaturas.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3194
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3227 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "armadura non v�lida"
 
-#: g10/keyedit.c:3235
+#: g10/keyedit.c:3229
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:3242
+#: g10/keyedit.c:3236
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3237
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3246
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3340
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3633,378 +3638,378 @@ msgstr ""
 "designado\n"
 "       pode facer que algunhas versi�ns de PGP rexeiten esta chave.\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3351
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Non pode engadir un revocador designado a unha chave de estilo PGP 2.x.\n"
 
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3371
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduza o ID de usuario do revocador designado: "
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3396
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "non se pode nomear unha chave estilo PGP 2.x coma revocador designado\n"
 
-#: g10/keyedit.c:3417
+#: g10/keyedit.c:3411
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "non se pode nomear unha chave coma o seu propio revocador designado\n"
 
-#: g10/keyedit.c:3439
+#: g10/keyedit.c:3433
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3452
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
 "se pode desfacer!\n"
 
-#: g10/keyedit.c:3464
+#: g10/keyedit.c:3458
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "�Est� seguro de que quere nomear esta chave coma revocador designado? (s/N): "
 
-#: g10/keyedit.c:3525
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite as selecci�ns das chaves secretas.\n"
 
-#: g10/keyedit.c:3531
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo unha chave secundaria.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando a data de expiraci�n para a chave secundaria.\n"
 
-#: g10/keyedit.c:3538
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiraci�n da chave primaria.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3582
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Non pode cambia-la data de expiraci�n dunha chave v3\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3598
 msgid "No corresponding signature in secret ring\n"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3678
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
 "se pode desfacer!\n"
 
-#: g10/keyedit.c:3679
+#: g10/keyedit.c:3684
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3841
+#: g10/keyedit.c:3846
 msgid "Please select exactly one user ID.\n"
 msgstr "Escolla exactamente un ID de usuario.\n"
 
-#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
+#: g10/keyedit.c:3885 g10/keyedit.c:3995 g10/keyedit.c:4115 g10/keyedit.c:4256
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitindo a auto-sinatura v3 do id de usuario \"%s\"\n"
 
-#: g10/keyedit.c:4051
+#: g10/keyedit.c:4056
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4131
+#: g10/keyedit.c:4136
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:4132
+#: g10/keyedit.c:4137
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4199
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notaci�n de sinaturas: "
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4348
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "�Sobrescribir? (s/N) "
 
-#: g10/keyedit.c:4407
+#: g10/keyedit.c:4412
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4470
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4492
+#: g10/keyedit.c:4497
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4627
+#: g10/keyedit.c:4632
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4635 g10/keyedit.c:4699 g10/keyedit.c:4742
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   asinada por %08lX no %s%s%s\n"
 
-#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4641
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/keyedit.c:4640
+#: g10/keyedit.c:4645
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�Est� seguro de que quere revocala? (s/N) "
 
-#: g10/keyedit.c:4644
+#: g10/keyedit.c:4649
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta sinatura? (s/N) "
 
-#: g10/keyedit.c:4671
+#: g10/keyedit.c:4676
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:4697
+#: g10/keyedit.c:4702
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4709
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4731
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:4746
+#: g10/keyedit.c:4751
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Realmente desexa crea-los certificados de revocaci�n? (s/N) "
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4781
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:4846
+#: g10/keyedit.c:4851
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:4863
+#: g10/keyedit.c:4868
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVISO: unha sinatura de ID de usuario ten unha data %d segundos no futuro\n"
 
-#: g10/keyedit.c:4927
+#: g10/keyedit.c:4932
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:4989
+#: g10/keyedit.c:4994
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:5084
+#: g10/keyedit.c:5089
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Amosando a id. fotogr�fica %s de tama�o %ld da chave 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "preferencia %c%lu duplicada\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:876
 msgid "writing direct signature\n"
 msgstr "escribindo unha sinatura directa\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:915
 msgid "writing self signature\n"
 msgstr "escribindo a propia sinatura\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:965
 msgid "writing key binding signature\n"
 msgstr "escribindo unha sinatura que liga a chave\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
+#: g10/keygen.c:2776
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de chave non v�lido; empregando %u bits\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de chave redondeado a %u bits\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1331
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1334
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1337
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifrar datos"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1340
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1348
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1367
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1371
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1376
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1379
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (s� cifrar)\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1382
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1385
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1441
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1443
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por defecto)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s� asinar)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (s� cifrar)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (s� asinar)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1453
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1522
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "O par de chaves DSA ha ter 1024 bits.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1532
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1539
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�Qu� tama�o de chave quere? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1553
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1559
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tama�o de chave requerido son %u bits\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1564 g10/keygen.c:1569
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeado a %u bits\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1618
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4020,7 +4025,7 @@ msgstr ""
 "      <n>m = a chave caduca en n meses\n"
 "      <n>y = a chave caduca en n anos\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1629
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4036,40 +4041,40 @@ msgstr ""
 "      <n>m = a sinatura caduca en n meses\n"
 "      <n>y = a sinatura caduca en n anos\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Key is valid for? (0) "
 msgstr "�Por canto tempo � v�lida a chave? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "�Por canto tempo � v�lida a sinatura? (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1673
 msgid "invalid value\n"
 msgstr "valor non v�lido\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1680
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1686
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca o %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1687
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1693
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4077,12 +4082,12 @@ msgstr ""
 "O seu sistema non pode amosar datas m�is al� do 2038.\n"
 "A�nda as�, hase tratar correctamente ata o 2106.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1698
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�Isto � correcto? (s/n) "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1713
 #, fuzzy
 msgid ""
 "\n"
@@ -4099,44 +4104,44 @@ msgstr ""
 "     \"Heinrich Heime (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1726
 msgid "Real name: "
 msgstr "Nome: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Invalid character in name\n"
 msgstr "Caracter non v�lido no nome\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name may not start with a digit\n"
 msgstr "O nome non pode comezar cun d�xito\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1738
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome debe ter alomenos 5 caracteres\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1746
 msgid "Email address: "
 msgstr "Enderezo de E-mail: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1752
 msgid "Not a valid email address\n"
 msgstr "Non � un enderezo de e-mail v�lido\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1760
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1766
 msgid "Invalid character in comment\n"
 msgstr "Car�cter non v�lido no comentario\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1789
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� a usa-lo xogo de caracteres `%s'.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1795
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4147,7 +4152,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1800
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor, non po�a o enderezo de correo no nome real ou no comentario\n"
@@ -4163,23 +4168,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeAaSs"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1826
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�Cambia-lo (N)ome, (C)omentario, (E)-mail ou (S)a�r? "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)a�r? "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:1846
 msgid "Please correct the error first\n"
 msgstr "Por favor, corrixa antes o erro\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1886
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4187,12 +4192,12 @@ msgstr ""
 "Necesita un contrasinal para protexe-la s�a chave secreta.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:1896 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1902
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4204,7 +4209,7 @@ msgstr ""
 "momento, empregando este programa coa opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:1924
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4216,50 +4221,50 @@ msgstr ""
 "mentres se xeran os n�meros primos; isto proporci�nalle ao xerador de\n"
 "n�meros aleatorios unha opoertunidade de acumular entrop�a de abondo.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2722
 msgid "Key generation canceled.\n"
 msgstr "Cancelouse a xeraci�n de chaves.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:2921 g10/keygen.c:3068
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "gravando a chave p�blica en `%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:2923 g10/keygen.c:3071
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:2926 g10/keygen.c:3074
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3057
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non se atopou un chaveiro p�blico no que se poida escribir: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3063
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non se atopou un chaveiro privado no que se poida escribir: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3081
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro p�blico `%s': %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3088
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3111
 msgid "public and secret key created and signed.\n"
 msgstr "cre�ronse e asin�ronse as chaves p�blica e secreta.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3122
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4269,12 +4274,12 @@ msgstr ""
 "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
 "con esa finalidade.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4282,7 +4287,7 @@ msgstr ""
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4290,26 +4295,26 @@ msgstr ""
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3197 g10/keygen.c:3326
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: a creaci�n de subchaves para chaves v3 non cumpre OpenPGP\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3236 g10/keygen.c:3359
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�Crear realmente? "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3524
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3571
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3597
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
@@ -4595,208 +4600,212 @@ msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:239
 #, 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:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "chave de sesi�n cifrada con %s\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:300
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrado cun algoritmo desco�ecido %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:381
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:438
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados coa chave p�blica: DEK correcto\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:471
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:475 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:479
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado cunha chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:493
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "fallou o descifrado de chave p�blica: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:507
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu contrasinais\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:509
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 contrasinal\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:540 g10/mainproc.c:562
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supo�endo datos cifrados con %s\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:548
 #, 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:581
+#: g10/mainproc.c:580
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:584
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: a mensaxe non ti�a protecci�n de integridade\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:597
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVISO: �a mensaxe cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:603
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:624
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remitente pediu \"confidencial\"\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:626
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro orixinal='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:711
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr ""
+
+#: g10/mainproc.c:839
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci�n independente - empregue \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1187
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1430
 msgid "signature verification suppressed\n"
 msgstr "verificaci�n de sinatura suprimida\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1539
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "non se poden manexar estas sinaturas m�ltiples\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1550
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1555
 #, 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:1544
+#: g10/mainproc.c:1575
 msgid "Key available at: "
 msgstr "Chave dispo�ible en: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Sinatura INCORRECTA de\""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Sinatura caducada de \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1797
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               alias \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1895
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1900
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1903
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr "modo texto"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 msgid "unknown"
 msgstr "desco�ecido"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Non foi posible verifica-la sinatura: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
 msgstr "non � unha sinatura separada\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:2037
 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:2013
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "sinatura independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Sinatura � vello estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z incorrecto detectado en proc_tree()\n"
 
@@ -4934,17 +4943,17 @@ msgstr "AVISO: as opci�ns de `%s' a�nda non est�n activas nesta execuci�n\n"
 msgid "directory `%s' created\n"
 msgstr "%s: directorio creado\n"
 
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:143
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "non � posible manexa-lo algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:713
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVISO: chave de sesi�n cifrada simetricamente potencialmente insegura\n"
 
-#: g10/parse-packet.c:1159
+#: g10/parse-packet.c:1164
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un subpaquete de tipo %d ten o bit cr�tico posto\n"
@@ -5709,12 +5718,12 @@ msgid ""
 "unexpanded.\n"
 msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de m�is).\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:346
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:355
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "Sinatura %s de: \"%s\"\n"
@@ -5736,11 +5745,11 @@ msgstr ""
 msgid "signing:"
 msgstr "asinando:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1101
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode asinar en claro con chaves estilo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:1278
+#: g10/sign.c:1280
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "hase empregar cifrado %s\n"
diff --git a/po/hu.po b/po/hu.po
index 8eb21289e..a30d6ce0d 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: [email protected]\n"
-"POT-Creation-Date: 2006-12-04 15:05+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2004-06-19 21:53+0200\n"
 "Last-Translator: Nagy Ferenc L�szl� <[email protected]>\n"
 "Language-Team: Hungarian <[email protected]>\n"
@@ -40,10 +40,10 @@ msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
+#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -77,9 +77,9 @@ msgstr "Nem tudom olvasni a(z) \"%s\" �llom�nyt: %s.\n"
 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:481 g10/gpg.c:1008 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
+#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
+#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
@@ -393,15 +393,15 @@ msgstr "titkos kulcs nem �ll rendelkez�sre"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
+#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban!\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
+#: g10/keygen.c:1456
 msgid "Your selection? "
 msgstr "Mit v�laszt? "
 
@@ -579,8 +579,8 @@ msgstr "   (%d) RSA (csak titkos�t�s)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
+#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "�rv�nytelen v�laszt�s.\n"
 
@@ -604,7 +604,7 @@ msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 msgid "secret key already stored on a card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1319 g10/keyedit.c:1351
 msgid "quit this menu"
 msgstr "kil�p�s ebb�l a men�b�l"
 
@@ -613,7 +613,7 @@ msgstr "kil�p�s ebb�l a men�b�l"
 msgid "show admin commands"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1322 g10/keyedit.c:1354
 msgid "show this help"
 msgstr "megmutatja ezt a s�g�t"
 
@@ -670,7 +670,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1457 g10/keyedit.c:1617
 msgid "Command> "
 msgstr "Parancs> "
 
@@ -689,7 +689,7 @@ msgstr "Egym�snak ellentmond� parancsok!\n"
 msgid "Admin commands are not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1602 g10/keyedit.c:2238
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 
@@ -744,7 +744,7 @@ msgstr "Ism�telje meg a jelsz�t: "
 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:3868 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -754,7 +754,7 @@ 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:3392 g10/keyserver.c:1705
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3386 g10/keyserver.c:1705
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -803,7 +803,7 @@ msgstr "Van egy titkos kulcs a \"%s\" nyilv�nos kulcshoz!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "El�sz�r azt t�r�lje a \"--delete-secret-keys\" opci�val!\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:213 g10/sign.c:1286
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
@@ -870,12 +870,12 @@ msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s titkos�tva \"%s\" sz�m�ra\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:292
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s titkos�tott adat.\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:296
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
@@ -1019,7 +1019,7 @@ msgstr "FIGYELEM: %08lX titkos kulcsnak nincs egyszer� SK ellen�rz��sszege.\n"
 msgid "WARNING: nothing exported\n"
 msgstr "FIGYELEM: Semmit sem export�ltam.\n"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:379
 msgid ""
 "@Commands:\n"
 " "
@@ -1027,128 +1027,128 @@ msgstr ""
 "@Parancsok:\n"
 " "
 
-#: g10/gpg.c:380
+#: g10/gpg.c:381
 msgid "|[file]|make a signature"
 msgstr "|[f�jl]|al��r�s k�sz�t�se"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "|[file]|make a clear text signature"
 msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:383
 msgid "make a detached signature"
 msgstr "k�l�n�ll� al��r�s k�sz�t�se"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "encrypt data"
 msgstr "adat titkos�t�sa"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "encryption only with symmetric cipher"
 msgstr "titkos�t�s csak szimmetrikus rejtjelez�vel"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "decrypt data (default)"
 msgstr "adat visszafejt�se (alap�rtelmez�s)"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "verify a signature"
 msgstr "al��r�s ellen�rz�se"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "list keys"
 msgstr "kulcsok list�z�sa"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:394
 msgid "list keys and signatures"
 msgstr "kulcsok �s al��r�sok list�z�sa"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kulcsal��r�sok ellen�rz�se"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "list keys and fingerprints"
 msgstr "kulcsok �s ujjlenyomatok list�z�sa"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "list secret keys"
 msgstr "titkos kulcsok list�z�sa"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "generate a new key pair"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "remove keys from the public keyring"
 msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "remove keys from the secret keyring"
 msgstr "kulcsok elt�vol�t�sa a titkoskulcs-karik�r�l"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "sign a key"
 msgstr "kulcs al��r�sa"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "sign a key locally"
 msgstr "kulcs al��r�sa helyileg"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:404
 msgid "sign or edit a key"
 msgstr "kulcs al��r�sa vagy szerkeszt�se"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "generate a revocation certificate"
 msgstr "visszavon�si igazol�s k�sz�t�se"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "export keys"
 msgstr "kulcsok export�l�sa"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:408
 msgid "export keys to a key server"
 msgstr "kulcsok export�l�sa kulcsszerverre"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:409
 msgid "import keys from a key server"
 msgstr "kulcsok import�l�sa kulcsszerverr�l"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "search for keys on a key server"
 msgstr "kulcsok keres�se kulcsszerveren"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:413
 msgid "update all keys from a keyserver"
 msgstr "minden kulcs friss�t�se kulcsszerverr�l"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:417
 msgid "import/merge keys"
 msgstr "kulcsok import�l�sa/�sszef�z�se"
 
-#: g10/gpg.c:419
+#: g10/gpg.c:420
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:421
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:422
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "update the trust database"
 msgstr "bizalmi adatb�zis friss�t�se"
 
-#: g10/gpg.c:437
+#: g10/gpg.c:438
 msgid "|algo [files]|print message digests"
 msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
 
-#: g10/gpg.c:441 g10/gpgv.c:71
+#: g10/gpg.c:442 g10/gpgv.c:70
 msgid ""
 "@\n"
 "Options:\n"
@@ -1158,51 +1158,51 @@ msgstr ""
 "Opci�k:\n"
 " "
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "create ascii armored output"
 msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
 
-#: g10/gpg.c:445
+#: g10/gpg.c:446
 msgid "|NAME|encrypt for NAME"
 msgstr "|N�V|titkos�t�s N�V r�sz�re"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "use this user-id to sign or decrypt"
 msgstr "felh. azonos�t� al��r�shoz �s visszafejt�shez"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:458
 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:462
+#: g10/gpg.c:463
 msgid "use canonical text mode"
 msgstr "kanonikus sz�veges m�d haszn�lata"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:477
 msgid "use as output file"
 msgstr "kimeneti �llom�ny megad�sa"
 
-#: g10/gpg.c:478 g10/gpgv.c:73
+#: g10/gpg.c:479 g10/gpgv.c:72
 msgid "verbose"
 msgstr "b�besz�d� m�d"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "do not make any changes"
 msgstr "ne csin�ljon semmi v�ltoztat�st"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:491
 msgid "prompt before overwriting"
 msgstr "fel�l�r�s el�tt r�k�rdez�s"
 
-#: g10/gpg.c:531
+#: g10/gpg.c:532
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:532
+#: g10/gpg.c:533
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1210,7 +1210,7 @@ msgstr ""
 "@\n"
 "(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
 
-#: g10/gpg.c:564
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1230,15 +1230,15 @@ msgstr ""
 " --list-keys [nevek]        kulcsok ki�rat�sa\n"
 " --fingerprint [nevek]      ujjlenyomatok ki�rat�sa\n"
 
-#: g10/gpg.c:763 g10/gpgv.c:98
+#: g10/gpg.c:766 g10/gpgv.c:97
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "A hib�kat (angolul) a <[email protected]> c�mre �rja meg!\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:783
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1248,7 +1248,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:794
+#: g10/gpg.c:797
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1256,577 +1256,582 @@ msgstr ""
 "\n"
 "T�mogatott algoritmusok:\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid "Pubkey: "
 msgstr "Nyilv�nos kulcs� (pubkey): "
 
-#: g10/gpg.c:803 g10/keyedit.c:2310
+#: g10/gpg.c:806 g10/keyedit.c:2304
 msgid "Cipher: "
 msgstr "Rejtjelez� (cipher): "
 
-#: g10/gpg.c:809
+#: g10/gpg.c:812
 msgid "Hash: "
 msgstr "Kivonatol� (hash): "
 
-#: g10/gpg.c:815 g10/keyedit.c:2356
+#: g10/gpg.c:818 g10/keyedit.c:2350
 msgid "Compression: "
 msgstr "T�m�r�t� (compression): "
 
-#: g10/gpg.c:898
+#: g10/gpg.c:901
 msgid "usage: gpg [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: g10/gpg.c:1046
+#: g10/gpg.c:1049
 msgid "conflicting commands\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1067
 #, 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:1261
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, 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:1279
+#: g10/gpg.c:1282
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1288
 #, 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:1288
+#: g10/gpg.c:1291
 #, 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:1291
+#: g10/gpg.c:1294
 #, 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:1297
+#: g10/gpg.c:1300
 #, 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:1300
+#: g10/gpg.c:1303
 #, 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:1303
+#: g10/gpg.c:1306
 #, 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:1444
+#: g10/gpg.c:1447
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 #, 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:1551
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mutatja a kilist�zott kulcs kulcskarik�j�t is"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1954
+#: g10/gpg.c:1957
 #, 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:1996
+#: g10/gpg.c:1999
 #, 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:2000
+#: g10/gpg.c:2003
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "\"%s\" opci�s f�jl: %s\n"
 
-#: g10/gpg.c:2007
+#: g10/gpg.c:2010
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, 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:2236
+#: g10/gpg.c:2239
 #, 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:2402 g10/gpg.c:2414
+#: g10/gpg.c:2405 g10/gpg.c:2417
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2494
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, 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:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2610
 #, 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:2768
+#: g10/gpg.c:2773
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2771
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
 
-#: g10/gpg.c:2858
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �rtelmetlen %s mellett!\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2875
 #, 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:2880
+#: g10/gpg.c:2890
 #, 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:2894
+#: g10/gpg.c:2904
 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:2900
+#: g10/gpg.c:2910
 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:2906
+#: g10/gpg.c:2916
 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:2919
+#: g10/gpg.c:2929
 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:2986 g10/gpg.c:3010
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:2992 g10/gpg.c:3016
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:2998
+#: g10/gpg.c:3008
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3004
+#: g10/gpg.c:3014
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3029
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3031
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3033
 #, 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:3025
+#: g10/gpg.c:3035
 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:3027
+#: g10/gpg.c:3037
 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:3030
+#: g10/gpg.c:3040
 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:3034
+#: g10/gpg.c:3044
 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:3041
+#: g10/gpg.c:3051
 msgid "invalid default preferences\n"
 msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3060
 msgid "invalid personal cipher preferences\n"
 msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3064
 msgid "invalid personal digest preferences\n"
 msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
 
-#: g10/gpg.c:3058
+#: g10/gpg.c:3068
 msgid "invalid personal compress preferences\n"
 msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
 
-#: g10/gpg.c:3091
+#: g10/gpg.c:3101
 #, 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:3138
+#: g10/gpg.c:3148
 #, 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:3143
+#: g10/gpg.c:3153
 #, 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:3148
+#: g10/gpg.c:3158
 #, 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:3250
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3271
 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:3272
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [f�jln�v]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [f�jln�v]"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3291
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [f�jln�v]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3314
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3306
+#: g10/gpg.c:3316
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3319
 #, 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:3327
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [f�jln�v]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3365
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3367
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3370
 #, 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:3380
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [f�jln�v]"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [f�jln�v]"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [f�jln�v]"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key felh-azonos�t�"
 
-#: g10/gpg.c:3426
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key felh-azonos�t�"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key felh-azonos�t� [parancsok]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [felh-azonos�t�] [kulcskarika]"
 
-#: g10/gpg.c:3560
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3572
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3564
+#: g10/gpg.c:3574
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexport�l�s sikertelen: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3585
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3595
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
 
-#: g10/gpg.c:3644
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
 
-#: g10/gpg.c:3854
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[f�jln�v]"
 
-#: g10/gpg.c:3858
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti g�pelni az �zenetet...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4172
 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:4164
+#: g10/gpg.c:4174
 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:4197
+#: g10/gpg.c:4207
 #, 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"
@@ -1853,43 +1858,43 @@ msgstr ""
 "%08lX �rv�nytelen kulcsot �rv�nyes�tett�k az\n"
 "--allow-non-selfsigned-uid opci�val.\n"
 
-#: g10/getkey.c:2380 g10/keyedit.c:3712
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, 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:2611
+#: g10/getkey.c:2614
 #, 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:2658
+#: g10/getkey.c:2661
 #, 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"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:73
 msgid "be somewhat more quiet"
 msgstr "m�g sz�kszav�bb m�d"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "take the keys from this keyring"
 msgstr "a megadott kulcskarik�r�l vegye a kulcsokat"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:76
 msgid "make timestamp conflicts only a warning"
 msgstr "id�b�lyeg-konfliktus eset�n csak figyelmeztessen"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:77
 msgid "|FD|write status info to this FD"
 msgstr "|�L|�llapotinform�ci�k �r�sa �L �llom�nyle�r�ra"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:101
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpgv [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:104
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2418,7 +2423,7 @@ msgstr "%08lX kulcs: �j kulcs - kihagytam.\n"
 msgid "no writable keyring found: %s\n"
 msgstr "Nem �rhat� kulcskarik�t tal�ltam: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
@@ -2779,42 +2784,42 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
+#: g10/keyedit.c:890 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Biztos abban, hogy tov�bbra is al� akarja �rni? (i/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
+#: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  Nem tudom al��rni.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "\"%s\" felhaszn�l�i azonos�t� lej�rt."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "\"%s\" felhaszn�l�azonos�t�n nincs �nal��r�s."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "\"%s\" felhaszn�l�azonos�t�n nincs �nal��r�s."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Val�ban al��rja? "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2823,11 +2828,11 @@ msgstr ""
 "\"%s\" �nal��r�sa\n"
 "PGP 2.x st�lus�.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Szeretn� �talak�tani OpenPGP �nal��r�ss�? (i/N) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2836,11 +2841,11 @@ msgstr ""
 "Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
 "kulcson lej�rt.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Szeretne kiadni egy �j al��r�st, amellyel lecser�li a lej�rtat? (i/N) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2849,54 +2854,54 @@ msgstr ""
 "Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
 "kulcson helyi al��r�s.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Szeretn� �talak�tani teljes, export�lhat� al��r�ss�? (i/N) "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" m�r al� lett �rva helyileg a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" m�r al� lett �rva a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "M�g egyszer al� akarja �rni? (i/N) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nincs mit al��rni a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Ez a kulcs lej�rt!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Ez a kulcs lej�r: %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Szeretn�, ha az al��r�sa ugyanekkor j�rna le? (I/n) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:883
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Lehet, hogy nem rakhat OpenPGP al��r�st egy PGP 2.x kulcsra --pgp2 m�dban.\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:885
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Ez haszn�lhatatlann� tenn� a kulcsot PGP 2.x-ben.\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:910
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2905,32 +2910,32 @@ msgstr ""
 "Mennyire gondosan ellen�rizte, hogy a kulcs, melyet al��rni k�sz�l, val�ban\n"
 "a fent nevezett szem�lyhez tartozik? Ha nem tudja a v�laszt, �rjon \"0\"-t!\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nem v�laszolok.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Egy�ltal�n nem ellen�riztem.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) A szok�sos ellen�rz�seket v�geztem.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Nagyon alaposan ellen�riztem.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:927
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Mi a v�lasza? (Adjon meg \"?\"-et magyar�zathoz!): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:951
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2939,100 +2944,100 @@ msgstr ""
 "Teljesen biztos abban, hogy al� akarja �rni ezt a kulcsot\n"
 "az �n kulcs�val: \""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:958
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ez egy �nal��r�s lesz.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "FIGYELEM: Az al��r�s nem lesz \"nem export�lhat�k�nt\" megjel�lve.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:972
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "FIGYELEM: Az al��r�s nem lesz \"nem visszavonhat�k�nt\" megjel�lve.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:982
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Az al��r�st \"nem export�lhat�nak\" jel�lj�k.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:989
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Az al��r�st \"nem visszavonhat�nak\" jel�lj�k.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Egy�ltal�n nem ellen�riztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1001
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "A szok�sos m�don ellen�riztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1006
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Nagyon gondosan ellen�riztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1016
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Val�ban al��rja? "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
-#: g10/keyedit.c:5004 g10/sign.c:352
+#: g10/keyedit.c:1061 g10/keyedit.c:4793 g10/keyedit.c:4884 g10/keyedit.c:4948
+#: g10/keyedit.c:5009 g10/sign.c:351
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Al��r�s sikertelen: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1126
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1137 g10/keygen.c:3215
 msgid "This key is not protected.\n"
 msgstr "Ez a kulcs nem v�dett.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1145 g10/keygen.c:3218
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1149 g10/keygen.c:3222
 msgid "Key is protected.\n"
 msgstr "A kulcs v�dett.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1173
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nem tudom szerkeszteni ezt a kulcsot: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1179
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3040,11 +3045,11 @@ msgstr ""
 "�rja be az �j jelsz�t ehhez a titkos kulcshoz!\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1188 g10/keygen.c:1895
 msgid "passphrase not correctly repeated; try again"
 msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1193
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3052,206 +3057,206 @@ msgstr ""
 "�n nem akar jelsz�t. Ez val�sz�n�leg *rossz* �tlet!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1196
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Val�ban ezt akarja? "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1267
 msgid "moving a key signature to the correct place\n"
 msgstr "�trakom a kulcsal��r�st a megfelel� helyre.\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1353
 msgid "save and quit"
 msgstr "ment�s �s kil�p�s"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1356
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1357
 msgid "list key and user IDs"
 msgstr "kilist�zza a kulcs- �s felhaszn�l�azonos�t�kat"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1359
 msgid "select user ID N"
 msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1360
 #, fuzzy
 msgid "select subkey N"
 msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1361
 #, fuzzy
 msgid "check signatures"
 msgstr "al��r�sok visszavon�sa"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1366
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "kulcs helyi al��r�sa"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Javaslat: V�lassza ki az al��rni k�v�nt felhaszn�l�azonos�t�kat!\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1379
 msgid "add a user ID"
 msgstr "felhaszn�l�i azonos�t� hozz�ad�sa"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1381
 msgid "add a photo ID"
 msgstr "fot�azonos�t� hozz�ad�sa"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1383
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "felhaszn�l�i azonos�t� t�rl�se"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1388
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1392
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1394
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1396
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "m�sodlagos kulcs t�rl�se"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1402
 msgid "add a revocation key"
 msgstr "visszavon� kulcs hozz�ad�sa"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nem v�ltoztathatja meg egy v3 kulcs lej�rati d�tum�t!\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "felhaszn�l�azonos�t� megjel�l�se els�dlegesk�nt"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "v�lt�s a titkos �s a nyilv�nos kulcs list�z�sa k�z�tt"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1413
 msgid "list preferences (expert)"
 msgstr "preferenci�k list�z�sa (szak�rt�)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1415
 msgid "list preferences (verbose)"
 msgstr "preferenci�k list�z�sa (r�szletes)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Val�ban visszavonja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "felhaszn�l�i azonos�t� visszavon�sa"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "m�sodlagos kulcs visszavon�sa"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "kulcs enged�lyez�se"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "kulcs tilt�sa"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "fot�azonos�t� megmutat�sa"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1446
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1564
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "Hiba \"%s\" titkoskulcs-blokk olvas�sakor: %s.\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1582
 msgid "Secret key is available.\n"
 msgstr "Titkos kulcs rendelkez�sre �ll.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1663
 msgid "Need the secret key to do this.\n"
 msgstr "Ehhez sz�ks�g van a titkos kulcsra.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1671
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "K�rem, haszn�lja el�bb a \"toggle\" parancsot!\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1690
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3259,241 +3264,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1730
 msgid "Key is revoked."
 msgstr "A kulcsot visszavont�k."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1749
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Val�ban al��rja az �sszes felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1756
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Javaslat: V�lassza ki az al��rni k�v�nt felhaszn�l�azonos�t�kat!\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1765
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "ismeretlen al��r�soszt�ly"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1788
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Ez a parancs %s m�dban nem enged�lyezett.\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
 msgid "You must select at least one user ID.\n"
 msgstr "Legal�bb egy felhaszn�l�azonos�t�t ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1812
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem t�r�lheti az utols� felhaszn�l�azonos�t�t!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1814
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Val�ban elt�vol�tja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1815
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Val�ban elt�vol�tja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1865
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Val�ban elt�vol�tja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1877
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1905
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1960
 msgid "You must select at least one key.\n"
 msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1963
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Val�ban t�rli a kiv�lasztott kulcsokat? "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1964
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Val�ban t�rli ezt a kulcsot? "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:1999
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Val�ban visszavonja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2000
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Val�ban visszavonja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2018
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Val�ban visszavonja ezt a kulcsot? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2029
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Val�ban visszavonja a kijel�lt kulcsokat? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Val�ban visszavonja ezt a kulcsot? "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2081
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2123
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "preferencialista be�ll�t�sa"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Val�ban friss�tsem a preferenci�kat? "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2199
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Mentsem a v�ltoztat�sokat? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2202
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Kil�pjek ment�s n�lk�l? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2212
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2226
 msgid "Key not changed so no update needed.\n"
 msgstr "A kulcs nem v�ltozott, nincs sz�ks�g friss�t�sre.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2327
 msgid "Digest: "
 msgstr "Kivonat: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2379
 msgid "Features: "
 msgstr "Jellemz�k: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2390
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2405 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2413 g10/keyedit.c:2414
 #, fuzzy
 msgid "Notations: "
 msgstr "Jel�l�s: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2624
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Nincsenek preferenci�k egy PGP 2.x felhaszn�l�azonos�t�n!\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2683
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Ezt a kulcsot a k�vetkez� %s kulcs visszavonhatja: "
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2704
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Ezt a kulcsot a k�vetkez� %s kulcs visszavonhatja: "
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2710
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (�rz�keny)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keyedit.c:2726 g10/keyedit.c:2782 g10/keyedit.c:2843 g10/keyedit.c:2858
 #: g10/keylist.c:194 g10/keyserver.c:511
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2729 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2731 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2733 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2735
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2754
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2761
 msgid "This key has been disabled"
 msgstr "Ez a kulcs tiltott."
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2789 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2813
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3501,19 +3506,19 @@ 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:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2944
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3521,7 +3526,7 @@ msgstr ""
 "FIGYELEM: Nincs kijel�lt els�dleges felhaszn�l�azonos�t�. Ez a parancs\n"
 " azt okozhatja, hogy egy m�sik azonos�t� lesz els�dlegesk�nt haszn�lva.\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3005
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3531,75 +3536,75 @@ msgstr ""
 "okozhatja,\n"
 "          hogy a PGP egyes verzi�i visszautas�tj�k ezt a kulcsot.\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3351
+#: g10/keyedit.c:3010 g10/keyedit.c:3345
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tov�bbra is hozz� akarja adni? (i/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3016
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Lehet, hogy nem adhat fot�azonos�t�t egy PGP2 st�lus� kulcshoz!\n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3156
 msgid "Delete this good signature? (y/N/q)"
 msgstr "T�rli ezt a j� al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3166
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "T�rli ezt az �rv�nytelen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3170
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "T�rli ezt az ismeretlen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3176
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Val�ban t�rli ezt az �nal��r�st? (i/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3190
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3191
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3194
 msgid "Nothing deleted.\n"
 msgstr "Nem t�r�ltem semmit.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3227 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "�rv�nytelen p�nc�l"
 
-#: g10/keyedit.c:3235
+#: g10/keyedit.c:3229
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:3242
+#: g10/keyedit.c:3236
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3237
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3246
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3340
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3609,372 +3614,372 @@ msgstr ""
 "          azt okozhatja, hogy egyes PGP verzi�k visszautas�tj�k ezt a "
 "kulcsot!\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3351
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Lehet, hogy nem adhat kijel�lt visszavon�t egy PGP 2.x-st�lus� kulcshoz.\n"
 
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3371
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�rja be a kijel�lt visszavon� felhaszn�l�azonos�t�j�t: "
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3396
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "Nem adhat meg PGP 2.x st�lus� kulcsot kijel�lt visszavon�nak!\n"
 
-#: g10/keyedit.c:3417
+#: g10/keyedit.c:3411
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Nem adhat meg egy kulcsot saj�t kijel�lt visszavon�j�nak!\n"
 
-#: g10/keyedit.c:3439
+#: g10/keyedit.c:3433
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "FIGYELEM: Ezt a kulcsot a kijel�lt visszavon� visszavonta!\n"
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3452
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "FIGYELEM: A kijel�lt visszavon� kulcs megad�sa nem csin�lhat� vissza!\n"
 
-#: g10/keyedit.c:3464
+#: g10/keyedit.c:3458
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Biztosan ez a kulcs legyen a kijel�lt visszavon�? (i/N): "
 
-#: g10/keyedit.c:3525
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "K�rem, t�vol�tsa el a kijel�l�seket a titkos kulcsokr�l!\n"
 
-#: g10/keyedit.c:3531
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Maximum egy m�sodlagos kulcsot jel�lj�n ki, k�rem!\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "M�sodlagos kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3538
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Els�dleges kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3582
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nem v�ltoztathatja meg egy v3 kulcs lej�rati d�tum�t!\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3598
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3678
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "FIGYELEM: %08lX al��r� alkulcs nem kereszthiteles�tett.\n"
 
-#: g10/keyedit.c:3679
+#: g10/keyedit.c:3684
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3841
+#: g10/keyedit.c:3846
 msgid "Please select exactly one user ID.\n"
 msgstr "K�rem, v�lasszon ki pontosan egy felhaszn�l�azonos�t�t!\n"
 
-#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
+#: g10/keyedit.c:3885 g10/keyedit.c:3995 g10/keyedit.c:4115 g10/keyedit.c:4256
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "Kihagyom a v3 �nal��r�st a \"%s\" felhaszn�l�azonos�t�n.\n"
 
-#: g10/keyedit.c:4051
+#: g10/keyedit.c:4056
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4131
+#: g10/keyedit.c:4136
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:4132
+#: g10/keyedit.c:4137
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4199
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Al��r�s-jel�l�s: "
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4348
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Fel�l�rjam (i/N)? "
 
-#: g10/keyedit.c:4407
+#: g10/keyedit.c:4412
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4470
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4492
+#: g10/keyedit.c:4497
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4627
+#: g10/keyedit.c:4632
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Felhaszn�l�azonos�t�: \""
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4635 g10/keyedit.c:4699 g10/keyedit.c:4742
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   al��rva %08lX �ltal %s%s%s id�pontban.\n"
 
-#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 msgid " (non-exportable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4641
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ez az al��r�s lej�rt %s id�pontban.\n"
 
-#: g10/keyedit.c:4640
+#: g10/keyedit.c:4645
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Biztos benne, hogy m�gis visszavonja? (i/N) "
 
-#: g10/keyedit.c:4644
+#: g10/keyedit.c:4649
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Csin�ljunk egy visszavon� igazol�st ehhez az al��r�shoz? (i/N) "
 
-#: g10/keyedit.c:4671
+#: g10/keyedit.c:4676
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�n al��rta a k�vetkez� felhaszn�l�azonos�t�kat:\n"
 
-#: g10/keyedit.c:4697
+#: g10/keyedit.c:4702
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4709
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   visszavonva %08lX �ltal %s id�pontban.\n"
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4731
 msgid "You are about to revoke these signatures:\n"
 msgstr "A k�vetkez� al��r�sokat fogja visszavonni:\n"
 
-#: g10/keyedit.c:4746
+#: g10/keyedit.c:4751
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Val�ban l�trehozzam a visszavon� igazol�st? (i/N) "
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4781
 msgid "no secret key\n"
 msgstr "Nincs titkos kulcs.\n"
 
-#: g10/keyedit.c:4846
+#: g10/keyedit.c:4851
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:4863
+#: g10/keyedit.c:4868
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "FIGYELEM: A felhaszn�l�azonos�t�t %d m�sodperccel a j�v�ben �rt�k al�.\n"
 
-#: g10/keyedit.c:4927
+#: g10/keyedit.c:4932
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:4989
+#: g10/keyedit.c:4994
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:5084
+#: g10/keyedit.c:5089
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s fot�azonos�t� (m�ret: %ld, kulcs: 0x%08lX, felh: %d) mutat�sa.\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "%c%lu preferencia k�tszer szerepel!\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "T�l sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "T�l sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "T�l sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:876
 msgid "writing direct signature\n"
 msgstr "Sima al��r�st �rok.\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:915
 msgid "writing self signature\n"
 msgstr "�nal��r�st �rok.\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:965
 msgid "writing key binding signature\n"
 msgstr "�sszef�z� al��r�st �rok.\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
+#: g10/keygen.c:2776
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Kulcsm�ret �rv�nytelen; %u bitet haszn�lok.\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Kulcsm�retet felkerek�tettem %u bitre.\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1331
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1334
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1337
 #, fuzzy
 msgid "Encrypt"
 msgstr "adat titkos�t�sa"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1340
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1348
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1367
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1371
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1376
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1379
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1382
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1385
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1441
 msgid "Please select what kind of key you want:\n"
 msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1443
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA �s ElGamal (alap�rtelmez�s)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (csak al��r�s)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (csak al��r�s)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1453
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1522
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "A DSA kulcsp�r 1024 bites lesz.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1532
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1539
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Milyen kulcsm�retet szeretne? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1553
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1559
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "A k�v�nt kulcsm�ret %u bit.\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1564 g10/keygen.c:1569
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "Felkerek�tve %u bitre.\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1618
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3990,7 +3995,7 @@ msgstr ""
 "      <n>m = a kulcs n h�napig �rv�nyes\n"
 "      <n>y = a kulcs n �vig �rv�nyes\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1629
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4006,40 +4011,40 @@ msgstr ""
 "      <n>m = az al��r�s n h�napig �rv�nyes\n"
 "      <n>y = az al��r�s n �vig �rv�nyes\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Key is valid for? (0) "
 msgstr "Meddig �rv�nyes a kulcs? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Meddig �rv�nyes az al��r�s? (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1673
 msgid "invalid value\n"
 msgstr "�rv�nytelen �rt�k!\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1680
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s soha nem j�r le.\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s soha nem j�r le.\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1686
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s lej�r: %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1687
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Az al��r�s lej�r: %s.\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1693
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4047,12 +4052,12 @@ msgstr ""
 "Az �n rendszere nem tud megjelen�teni 2038 ut�ni d�tumokat.\n"
 "Azonban kezelni helyesen tudja �ket eg�szen 2106-ig.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1698
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Ez �gy helyes (i/n)? "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1713
 #, fuzzy
 msgid ""
 "\n"
@@ -4069,44 +4074,44 @@ msgstr ""
 "    \"Heinrich Heine (a k�lt�) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1726
 msgid "Real name: "
 msgstr "Teljes n�v: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Invalid character in name\n"
 msgstr "�rv�nytelen karakter a n�vben!\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name may not start with a digit\n"
 msgstr "A n�v lehet, hogy nem kezd�dhet sz�mmal!\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1738
 msgid "Name must be at least 5 characters long\n"
 msgstr "A n�v legal�bb 5 karakter kell legyen!\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1746
 msgid "Email address: "
 msgstr "E-mail c�m: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1752
 msgid "Not a valid email address\n"
 msgstr "Ez nem �rv�nyes e-mail c�m.\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1760
 msgid "Comment: "
 msgstr "Megjegyz�s: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1766
 msgid "Invalid character in comment\n"
 msgstr "�rv�nytelen karakter a megjegyz�sben!\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1789
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "�n a(z) %s karakterk�dol�st haszn�lja.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1795
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4117,7 +4122,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1800
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "K�rem, ne rakja az e-mail c�met a teljes n�vbe vagy a megjegyz�sbe!\n"
 
@@ -4132,24 +4137,24 @@ msgstr "K�rem, ne rakja az e-mail c�met a teljes n�vbe vagy a megjegyz�sbe!\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 msgid "NnCcEeOoQq"
 msgstr "NnMmEeRrKk"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1826
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "(N)�v, (M)egjegyz�s, (E)-mail megv�ltoztat�sa vagy (K)il�p�s? "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "(N)�v, (M)egjegyz�s, (E)-mail megv�ltoztat�sa vagy (R)endben/(K)il�p�s? "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:1846
 msgid "Please correct the error first\n"
 msgstr "K�rem, el�bb jav�tsa ki a hib�t!\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1886
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4157,12 +4162,12 @@ msgstr ""
 "Most sz�ks�g van egy jelsz�ra (vagy mondatra), amely a titkos kulcs�t v�di.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:1896 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1902
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4174,7 +4179,7 @@ msgstr ""
 "az \"--edit-key\" opci�val.\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:1924
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4186,50 +4191,50 @@ msgstr ""
 "a lemezeket) a pr�msz�m gener�l�sa alatt. Ez seg�ti a v�letlensz�m-\n"
 "gener�tort, hogy entr�pi�t tudjon gy�jteni.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2722
 msgid "Key generation canceled.\n"
 msgstr "Kulcs l�trehoz�sa megszak�tva.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:2921 g10/keygen.c:3068
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�rom a kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:2923 g10/keygen.c:3071
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:2926 g10/keygen.c:3074
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3057
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "Nem �rhat� nyilv�noskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3063
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "Nem �rhat� titkoskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3081
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" nyilv�noskulcs-karika �r�sakor: %s.\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3088
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3111
 msgid "public and secret key created and signed.\n"
 msgstr "A nyilv�nos �s titkos kulcsokat l�trehoztam �s al��rtam.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3122
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4239,46 +4244,46 @@ msgstr ""
 "k�v�n ilyen c�lra l�trehozni, azt az \"--edit-key\" parancs seg�ts�g�vel\n"
 "teheti meg.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3197 g10/keygen.c:3326
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "MEGJEGYZ�S: Alkulcsok l�trehoz�sa v3 kulcsokhoz nem OpenPGP-megfelel�.\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3236 g10/keygen.c:3359
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Val�ban l�trehozzam? "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3524
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3571
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3597
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "MEGJEGYZ�S: %08lX titkos kulcs %s-kor lej�rt.\n"
@@ -4567,210 +4572,214 @@ 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:240
+#: g10/mainproc.c:239
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "Furcsa m�ret� (%d) titkos�tott munkafolyamatkulcs.\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s titkos�tott munkafolyamatkulcs\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:300
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:381
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "Nyilv�nos kulcs: %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:438
 msgid "public key encrypted data: good DEK\n"
 msgstr "Nyilv�nos kulccsal titkos�tott adat: j� DEK.\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:471
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:475 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:479
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Titkos�tva %s kulccsal, azonos�t�: %08lX\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:493
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Nyilv�nos kulcs� visszafejt�s sikertelen: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:507
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu jelsz�val rejtjelezve\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:509
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 jelsz�val rejtjelezve\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:540 g10/mainproc.c:562
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s titkos�tott adatot felt�telezek.\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:548
 #, 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:581
+#: g10/mainproc.c:580
 msgid "decryption okay\n"
 msgstr "Visszafejt�s rendben.\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:584
 msgid "WARNING: message was not integrity protected\n"
 msgstr "FIGYELEM: Az �zenetet nem l�tt�k el integrit�sv�delemmel.\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:597
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "FIGYELEM: A titkos�tott �zenetet manipul�lt�k!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:603
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:624
 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:625
+#: g10/mainproc.c:626
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Eredeti f�jln�v: '%.*s'.\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:711
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr ""
+
+#: g10/mainproc.c:839
 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:1165
+#: g10/mainproc.c:1187
 #, fuzzy
 msgid "no signature found\n"
 msgstr "J� al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1430
 msgid "signature verification suppressed\n"
 msgstr "Al��r�s-ellen�rz�s elnyomva.\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1539
 #, 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:1519
+#: g10/mainproc.c:1550
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1555
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Al��rva: %.*s; kulcs: %s, %08lX.\n"
 
-#: g10/mainproc.c:1544
+#: g10/mainproc.c:1575
 msgid "Key available at: "
 msgstr "Kulcs tal�lhat�: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ROSSZ al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Lej�rt al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "J� al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr "[bizonytalan]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1797
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               azaz \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1895
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1900
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Az al��r�s lej�r: %s.\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1903
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr "Bin�ris"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr "Sz�vegm�d�"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 msgid "unknown"
 msgstr "Ismeretlen m�d�"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem tudom ellen�rizni az al��r�st: %s.\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
 msgstr "Nem k�l�n�ll� al��r�s.\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:2037
 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:2013
+#: g10/mainproc.c:2045
 #, 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:2070
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr "R�gi st�lus� (PGP 2.x) al��r�s.\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�rv�nytelen gy�k�rcsomagot tal�ltam a proc_tree() f�ggv�nyben!\n"
 
@@ -4908,17 +4917,17 @@ msgstr ""
 msgid "directory `%s' created\n"
 msgstr "%s: K�nyvt�rat l�trehoztam.\n"
 
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:143
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "Nem tudom kezelni a(z) %d. sz�m� nyilv�nos kulcs� algoritmust!\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:713
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "FIGYELEM: A rejtjelezett munkafolyamat-kulcs lehet, hogy nem biztons�gos!\n"
 
-#: g10/parse-packet.c:1159
+#: g10/parse-packet.c:1164
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "A %d t�pus� alcsomag kritikus bitje be�ll�tott.\n"
@@ -5677,12 +5686,12 @@ msgstr ""
 "hossz�).\n"
 "Kifejt�s n�lk�l haszn�lom.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:346
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:355
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s al��r�s a k�vetkez�t�l: \"%s\"\n"
@@ -5704,12 +5713,12 @@ msgstr ""
 msgid "signing:"
 msgstr "Al��rom:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1101
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Olvashat� sz�veget PGP 2.x st�lus� kulccsal csak --pgp2 m�dban �rhat al�!\n"
 
-#: g10/sign.c:1278
+#: g10/sign.c:1280
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s titkos�t�st fogok haszn�lni.\n"
diff --git a/po/id.po b/po/id.po
index c6af09d39..d11687c0a 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: [email protected]\n"
-"POT-Creation-Date: 2006-12-04 15:05+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <[email protected]>\n"
 "Language-Team: Indonesian <[email protected]>\n"
@@ -42,10 +42,10 @@ msgstr "menulis kunci rahasia ke `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
+#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -78,9 +78,9 @@ 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:481 g10/gpg.c:1008 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
+#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
+#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
@@ -395,15 +395,15 @@ msgstr "kunci rahasia tidak tersedia"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
+#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
+#: g10/keygen.c:1456
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
@@ -581,8 +581,8 @@ msgstr "  (%d) RSA (hanya enkripsi)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
+#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
@@ -606,7 +606,7 @@ msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 msgid "secret key already stored on a card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1319 g10/keyedit.c:1351
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
@@ -615,7 +615,7 @@ msgstr "berhenti dari menu ini"
 msgid "show admin commands"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1322 g10/keyedit.c:1354
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
@@ -672,7 +672,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1457 g10/keyedit.c:1617
 msgid "Command> "
 msgstr "Perintah> "
 
@@ -691,7 +691,7 @@ msgstr "perintah saling konflik\n"
 msgid "Admin commands are not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1602 g10/keyedit.c:2238
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
@@ -746,7 +746,7 @@ msgstr "Ulangi passphrase: "
 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:3868 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -756,7 +756,7 @@ 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:3392 g10/keyserver.c:1705
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3386 g10/keyserver.c:1705
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -805,7 +805,7 @@ msgstr "terdapat kunci rahasia untuk kunci publik \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:213 g10/sign.c:1286
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
@@ -874,12 +874,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:91 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:292
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s data terenkripsi\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:296
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
@@ -1023,7 +1023,7 @@ msgstr ""
 msgid "WARNING: nothing exported\n"
 msgstr "PERINGATAN: tidak ada yang diekspor\n"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:379
 msgid ""
 "@Commands:\n"
 " "
@@ -1031,128 +1031,128 @@ msgstr ""
 "@Perintah:\n"
 " "
 
-#: g10/gpg.c:380
+#: g10/gpg.c:381
 msgid "|[file]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:383
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:394
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "remove keys from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "remove keys from the secret keyring"
 msgstr "hapus kunci dari keyring pribadi"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:404
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:408
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:409
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "search for keys on a key server"
 msgstr "cari kunci di key server"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:413
 msgid "update all keys from a keyserver"
 msgstr "update semua kunci dari keyserver"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:417
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/gpg.c:419
+#: g10/gpg.c:420
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:421
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:422
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/gpg.c:437
+#: g10/gpg.c:438
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/gpg.c:441 g10/gpgv.c:71
+#: g10/gpg.c:442 g10/gpgv.c:70
 msgid ""
 "@\n"
 "Options:\n"
@@ -1162,51 +1162,51 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/gpg.c:445
+#: g10/gpg.c:446
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:458
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/gpg.c:462
+#: g10/gpg.c:463
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:477
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/gpg.c:478 g10/gpgv.c:73
+#: g10/gpg.c:479 g10/gpgv.c:72
 msgid "verbose"
 msgstr "detil"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:491
 msgid "prompt before overwriting"
 msgstr "tanya sebelum menimpa"
 
-#: g10/gpg.c:531
+#: g10/gpg.c:532
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:532
+#: g10/gpg.c:533
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1214,7 +1214,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/gpg.c:564
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1234,15 +1234,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/gpg.c:763 g10/gpgv.c:98
+#: g10/gpg.c:766 g10/gpgv.c:97
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Laporkan bug ke <[email protected]>.\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:783
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1252,7 +1252,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/gpg.c:794
+#: g10/gpg.c:797
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1260,585 +1260,590 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2310
+#: g10/gpg.c:806 g10/keyedit.c:2304
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:809
+#: g10/gpg.c:812
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2356
+#: g10/gpg.c:818 g10/keyedit.c:2350
 msgid "Compression: "
 msgstr "Kompresi: "
 
-#: g10/gpg.c:898
+#: g10/gpg.c:901
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/gpg.c:1046
+#: g10/gpg.c:1049
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1067
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1288
 #, 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:1288
+#: g10/gpg.c:1291
 #, 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:1291
+#: g10/gpg.c:1294
 #, 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:1297
+#: g10/gpg.c:1300
 #, 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:1300
+#: g10/gpg.c:1303
 #, 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:1303
+#: g10/gpg.c:1306
 #, 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:1444
+#: g10/gpg.c:1447
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1954
+#: g10/gpg.c:1957
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
 
-#: g10/gpg.c:1996
+#: g10/gpg.c:1999
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/gpg.c:2000
+#: g10/gpg.c:2003
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/gpg.c:2007
+#: g10/gpg.c:2010
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/gpg.c:2236
+#: g10/gpg.c:2239
 #, 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:2402 g10/gpg.c:2414
+#: g10/gpg.c:2405 g10/gpg.c:2417
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2494
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "%s bukanlah set karakter yang valid\n"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/gpg.c:2768
+#: g10/gpg.c:2773
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2771
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/gpg.c:2858
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2875
 #, 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:2880
+#: g10/gpg.c:2890
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/gpg.c:2894
+#: g10/gpg.c:2904
 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:2900
+#: g10/gpg.c:2910
 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:2906
+#: g10/gpg.c:2916
 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:2919
+#: g10/gpg.c:2929
 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:2986 g10/gpg.c:3010
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:2992 g10/gpg.c:3016
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:2998
+#: g10/gpg.c:3008
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3004
+#: g10/gpg.c:3014
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3029
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3031
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3033
 #, 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:3025
+#: g10/gpg.c:3035
 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:3027
+#: g10/gpg.c:3037
 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:3030
+#: g10/gpg.c:3040
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3044
 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:3041
+#: g10/gpg.c:3051
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3060
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3064
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/gpg.c:3058
+#: g10/gpg.c:3068
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/gpg.c:3091
+#: g10/gpg.c:3101
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3148
 #, 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:3143
+#: g10/gpg.c:3153
 #, 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:3148
+#: g10/gpg.c:3158
 #, 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:3250
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3271
 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:3272
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3291
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3314
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3306
+#: g10/gpg.c:3316
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3319
 #, 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:3327
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3365
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3367
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3370
 #, 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:3380
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/gpg.c:3426
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/gpg.c:3560
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3572
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/gpg.c:3564
+#: g10/gpg.c:3574
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3585
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3595
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/gpg.c:3644
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/gpg.c:3854
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/gpg.c:3858
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4172
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4174
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4207
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@ -1863,42 +1868,42 @@ msgstr ""
 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:2380 g10/keyedit.c:3712
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, 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:2611
+#: g10/getkey.c:2614
 #, 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:2658
+#: g10/getkey.c:2661
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:73
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "take the keys from this keyring"
 msgstr "mengambil kunci ini dari keyring"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:76
 msgid "make timestamp conflicts only a warning"
 msgstr "buat timestamp konflik hanya sebagai peringatan"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:77
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:101
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Pemakaian: gpgv [opsi] [file] (-h untuk bantuan)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:104
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2433,7 +2438,7 @@ msgstr "kunci %08lX: kunci baru - dilewati\n"
 msgid "no writable keyring found: %s\n"
 msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
@@ -2791,42 +2796,42 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
+#: g10/keyedit.c:890 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Apakah anda yakin masih ingin menandainya? (y/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
+#: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "..Tidak dapat menandai.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User ID \"%s\" kadaluwarsa."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User ID \"%s\" bukan self-signed."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "User ID \"%s\" bukan self-signed."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2835,11 +2840,11 @@ msgstr ""
 "Self-signature pada \"%s\"\n"
 "adalah signature bergaya PGP 2.x.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Anda ingin mempromosikannya ke self-signature OpenPGP ? (y/N) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2848,13 +2853,13 @@ msgstr ""
 "Signature anda saat ini pada \"%s\"\n"
 "telah habis berlaku.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Anda ingin mengeluarkan signature baru untuk menggantikan yang telah habis "
 "berlaku? (y/N)"
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2863,43 +2868,43 @@ msgstr ""
 "Signature anda saat ini pada \"%s\"\n"
 "adalah signature.lokal \n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Apakah anda ingin menjadikannya signature yang full exportable? (y/N)"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" Sudah ditandai secara lokal dengan kunci %08lX\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" Sudah ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Apakah anda ingin menandainya lagi? (y/N) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Kunci ini telah berakhir!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Anda ingin signature anda kadaluarsa pada waktu yang sama? (y/n) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:883
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2907,11 +2912,11 @@ msgstr ""
 "Anda tidak boleh membuat signature OpenPGP pada sebuah kunci PGP 2.x saat "
 "dalam mode --pgp2\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:885
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Hal ini akan membuat kunci tidak dapat digunakan dalam PGP 2.x.\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:910
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2921,32 +2926,32 @@ msgstr ""
 "menandai benar benar milik\n"
 "orang tersebut?  Jika anda tidak tahu jawabannya. masukkan \"0\".\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Saya tidak akan menjawab.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Saya belum memeriksanya.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Saya telah melakukan pemeriksaan biasa.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Saya telah melakukan pemeriksaan hati-hati.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:927
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Pilihan Anda? (berikan '?' untuk informasi lebih lanjut):"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:951
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2955,100 +2960,100 @@ msgstr ""
 "Apakah anda yakin untuk menandai kunci ini \n"
 "dengan kunci anda: "
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:958
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ini akan jadi self-signature.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Peringatan: Signature akan ditandai sebagai tidak dapat diekspor.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:972
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Peringatan: Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:982
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat diekspor.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:989
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Saya belum memeriksa kunci ini sama sekali.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1001
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1006
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini dengan sangat hati-hati.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1016
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
-#: g10/keyedit.c:5004 g10/sign.c:352
+#: g10/keyedit.c:1061 g10/keyedit.c:4793 g10/keyedit.c:4884 g10/keyedit.c:4948
+#: g10/keyedit.c:5009 g10/sign.c:351
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1126
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1137 g10/keygen.c:3215
 msgid "This key is not protected.\n"
 msgstr "Kunci ini tidak diproteksi.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1145 g10/keygen.c:3218
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1149 g10/keygen.c:3222
 msgid "Key is protected.\n"
 msgstr "Kunci diproteksi.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1173
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tidak dapat mengedit kunci ini: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1179
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3056,11 +3061,11 @@ msgstr ""
 "Masukkan passphrase baru untuk kunci rahasia ini.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1188 g10/keygen.c:1895
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1193
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3068,206 +3073,206 @@ msgstr ""
 "Anda tidak ingin passphrase - bukan ide yang baik!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1196
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Apakah anda ingin melakukan hal ini? "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1267
 msgid "moving a key signature to the correct place\n"
 msgstr "memindahkan signature kunci ke tempat yang tepat\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1353
 msgid "save and quit"
 msgstr "simpan dan berhenti"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1356
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1357
 msgid "list key and user IDs"
 msgstr "tampilkan kunci dan ID user"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1359
 msgid "select user ID N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1360
 #, fuzzy
 msgid "select subkey N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1361
 #, fuzzy
 msgid "check signatures"
 msgstr "batalkan signature"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1366
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1379
 msgid "add a user ID"
 msgstr "tambah sebuah ID user"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1381
 msgid "add a photo ID"
 msgstr "tambah sebuah photo ID"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1383
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "hapus ID user"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1388
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1392
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1394
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1396
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "hapus kunci sekunder"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1402
 msgid "add a revocation key"
 msgstr "tambah kunci pembatalan"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "tandai ID user sebagai primer"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "ubah tampilan kunci rahasia dan publik"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1413
 msgid "list preferences (expert)"
 msgstr "tampilkan preferensi (ahli)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1415
 msgid "list preferences (verbose)"
 msgstr "tampilkan preferensi (verbose)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "ubah passphrase"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "ubah ownertrust"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Benar-benar hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "batalkan sebuah ID user"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "batalkan kunci sekunder"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "aktifkan kunci"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "tiadakan kunci"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "tampilkan photo ID"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1446
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1564
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "kesalahan membaca keyblock rahasia `%s': %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1582
 msgid "Secret key is available.\n"
 msgstr "Kunci rahasia tersedia.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1663
 msgid "Need the secret key to do this.\n"
 msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1671
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Silakan gunakan dulu perintah \"toogle\".\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1690
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3275,241 +3280,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1730
 msgid "Key is revoked."
 msgstr "Kunci dibatalkan"
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1749
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Tandai ID seluruh user? "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1756
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1765
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "kelas signature tidak dikenal"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1788
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
 msgid "You must select at least one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1812
 msgid "You can't delete the last user ID!\n"
 msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1814
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1815
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1865
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1877
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1905
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1960
 msgid "You must select at least one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1963
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1964
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Anda ingin menghapus kunci ini? "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:1999
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Benar-benar hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2000
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Benar-benar hapus ID user ini? "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2018
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2029
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Anda ingin membatalkan kunci terpilih ini? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2081
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2123
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "set daftar preferensi"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Update preferensi?"
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2199
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Simpan perubahan? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2202
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2212
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2226
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2327
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2379
 msgid "Features: "
 msgstr "Fitur: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2390
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2405 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2413 g10/keyedit.c:2414
 #, fuzzy
 msgid "Notations: "
 msgstr "Notasi: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2624
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Tidak ada preferensi pada user ID bergaya PGP 2.x.\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2683
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2704
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2710
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keyedit.c:2726 g10/keyedit.c:2782 g10/keyedit.c:2843 g10/keyedit.c:2858
 #: g10/keylist.c:194 g10/keyserver.c:511
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2729 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2731 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2733 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2735
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2754
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2761
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2789 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2813
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3517,19 +3522,19 @@ msgstr ""
 "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
 "kecuali anda memulai kembali program.\n"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2944
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3537,7 +3542,7 @@ msgstr ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3005
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3547,75 +3552,75 @@ msgstr ""
 "dapat menyebabkan beberapa versi\n"
 "          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3351
+#: g10/keyedit.c:3010 g10/keyedit.c:3345
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3016
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Anda tidak boleh menambahkan sebuah photo ID ke kunci bergaya PGP2 \n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3156
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3166
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3170
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3176
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3190
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3191
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3194
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3227 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "armor tidak valid"
 
-#: g10/keyedit.c:3235
+#: g10/keyedit.c:3229
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:3242
+#: g10/keyedit.c:3236
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3237
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3246
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3340
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3625,375 +3630,375 @@ msgstr ""
 "designated dapat\n"
 "............menyebabkan beberapa versi PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3351
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Anda tidak boleh revoker designated ke kunci bergaya PGP2.x.\n"
 
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3371
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3396
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "tidak dapat menunjuk kunci bergaya PGP 2.x sebagai pihak yang dibatalkan\n"
 
-#: g10/keyedit.c:3417
+#: g10/keyedit.c:3411
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "anda tidak dapat menunjuk sebuah kunci sebagai pihak yang dibatalkan "
 "sendiri\n"
 
-#: g10/keyedit.c:3439
+#: g10/keyedit.c:3433
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pihak yang berwenang\n"
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3452
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "PERINGATAN: menunjuk sebuah kunci sebagai pihak yang dibatalkan tidak dapat "
 "dilakukan\n"
 
-#: g10/keyedit.c:3464
+#: g10/keyedit.c:3458
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):"
 
-#: g10/keyedit.c:3525
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:3531
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:3538
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3582
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3598
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3678
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
 
-#: g10/keyedit.c:3679
+#: g10/keyedit.c:3684
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3841
+#: g10/keyedit.c:3846
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
+#: g10/keyedit.c:3885 g10/keyedit.c:3995 g10/keyedit.c:4115 g10/keyedit.c:4256
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "melewati self-signature v3 pada user id \"%s\"\n"
 
-#: g10/keyedit.c:4051
+#: g10/keyedit.c:4056
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4131
+#: g10/keyedit.c:4136
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:4132
+#: g10/keyedit.c:4137
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4199
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notasi signature: "
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4348
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ditimpa (y/T)? "
 
-#: g10/keyedit.c:4407
+#: g10/keyedit.c:4412
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4470
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4492
+#: g10/keyedit.c:4497
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4627
+#: g10/keyedit.c:4632
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID user: "
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4635 g10/keyedit.c:4699 g10/keyedit.c:4742
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ditandai oleh %08lX pada %s%s%s\n"
 
-#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 msgid " (non-exportable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4641
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:4640
+#: g10/keyedit.c:4645
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Anda tetap ingin membatalkannya? (y/n) "
 
-#: g10/keyedit.c:4644
+#: g10/keyedit.c:4649
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
-#: g10/keyedit.c:4671
+#: g10/keyedit.c:4676
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/keyedit.c:4697
+#: g10/keyedit.c:4702
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4709
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4731
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:4746
+#: g10/keyedit.c:4751
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4781
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:4846
+#: g10/keyedit.c:4851
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4863
+#: g10/keyedit.c:4868
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "PERINGATAN: signature user ID bertanggal %d detik di masa depan\n"
 
-#: g10/keyedit.c:4927
+#: g10/keyedit.c:4932
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4989
+#: g10/keyedit.c:4994
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:5084
+#: g10/keyedit.c:5089
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Menampilkan photo ID %s berukuran %ld untuk kunci 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "preferensi %c%lu ganda \n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:876
 msgid "writing direct signature\n"
 msgstr "menulis signature direct\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:915
 msgid "writing self signature\n"
 msgstr "menulis self signature\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:965
 msgid "writing key binding signature\n"
 msgstr "menulis key binding signature\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
+#: g10/keygen.c:2776
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize tidak valid; menggunakan %u bit\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1331
 #, fuzzy
 msgid "Sign"
 msgstr "tandai"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1334
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1337
 #, fuzzy
 msgid "Encrypt"
 msgstr "enkripsi data"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1340
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1348
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1367
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1371
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1376
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1379
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1382
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1385
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1441
 msgid "Please select what kind of key you want:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1443
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "  (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "  (%d) RSA (hanya menandai)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1453
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1522
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Keypair DSA akan memiliki 1024 bit.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1532
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1539
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1553
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1559
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1564 g10/keygen.c:1569
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1618
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4009,7 +4014,7 @@ msgstr ""
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1629
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4025,40 +4030,40 @@ msgstr ""
 "     <n>m = signature berakhir dalam n bulan\n"
 "     <n>y = signature berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signature valid untuk? (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1673
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1680
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1686
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s berakhir pada %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1687
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1693
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4066,12 +4071,12 @@ msgstr ""
 "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
 "Namun, ia dapat menanganinya secara benar hingga 2106.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1698
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1713
 #, fuzzy
 msgid ""
 "\n"
@@ -4087,44 +4092,44 @@ msgstr ""
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 "  \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1726
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1738
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nama harus berukuran minimum 5 karakter\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1746
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1752
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1760
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1766
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1789
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Anda menggunakan set karakter `%s'.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1795
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4134,7 +4139,7 @@ msgstr ""
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1800
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
 
@@ -4149,23 +4154,23 @@ msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1826
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:1846
 msgid "Please correct the error first\n"
 msgstr "Silakan perbaiki kesalahan ini dulu\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1886
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4173,12 +4178,12 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:1896 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1902
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4191,7 +4196,7 @@ msgstr ""
 "menggunakan program ini dengan pilihan \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:1924
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4203,50 +4208,50 @@ msgstr ""
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2722
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:2921 g10/keygen.c:3068
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "menulis kunci publik ke `%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:2923 g10/keygen.c:3071
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:2926 g10/keygen.c:3074
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3057
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3063
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3081
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring publik `%s': %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3088
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3111
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3122
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4256,45 +4261,45 @@ msgstr ""
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3197 g10/keygen.c:3326
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "CATATAN: membuat subkey bagi kunci-kunci v3 tidak OpenPGP compliant\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3236 g10/keygen.c:3359
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Ingin diciptakan? "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3524
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3571
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3597
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
@@ -4579,208 +4584,212 @@ msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:239
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "ukuran aneh untuk kunci sesi terenkripsi (%d)\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s kunci sesi enkripsi\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:300
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:381
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "kunci publik adalah %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:438
 msgid "public key encrypted data: good DEK\n"
 msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:471
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:475 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:479
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:493
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "gagal dekripsi kunci publik: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:507
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "dienkripsi dengan passphrase %lu\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:509
 msgid "encrypted with 1 passphrase\n"
 msgstr "dienkripsi dengan 1 passphrase\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:540 g10/mainproc.c:562
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "asumsikan %s data terenkripsi\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:548
 #, 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:581
+#: g10/mainproc.c:580
 msgid "decryption okay\n"
 msgstr "dekripsi lancar\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:584
 msgid "WARNING: message was not integrity protected\n"
 msgstr "PERINGATAN: integritas pesan tidak terlindungi\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:597
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:603
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:624
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:626
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:711
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr ""
+
+#: g10/mainproc.c:839
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1187
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1430
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak diabaikan\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1539
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "tidak dapat menangani banyak signature ini\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1550
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1555
 #, 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:1544
+#: g10/mainproc.c:1575
 msgid "Key available at: "
 msgstr "Kunci tersedia di:"
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature kadaluarsa dari \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1797
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1895
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1900
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1903
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr "biner"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr "modeteks"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 msgid "unknown"
 msgstr "tidak dikenal"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
 msgstr "bukan detached signature\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:2037
 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:2013
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature mandiri 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
@@ -4915,16 +4924,16 @@ msgstr "PERINGATAN: opsi dalam `%s' belum aktif selama pelaksanaan ini\n"
 msgid "directory `%s' created\n"
 msgstr "%s: direktori tercipta\n"
 
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:143
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:713
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n"
 
-#: g10/parse-packet.c:1159
+#: g10/parse-packet.c:1164
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
@@ -5680,12 +5689,12 @@ msgstr ""
 "PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar).  "
 "Menggunakan yang tidak expand.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:346
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:355
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signature dari: \"%s\"\n"
@@ -5706,13 +5715,13 @@ msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
 msgid "signing:"
 msgstr "menandai:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1101
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat clearsign dengan kunci bergaya PGP 2.x saat dalam mode --"
 "pgp2\n"
 
-#: g10/sign.c:1278
+#: g10/sign.c:1280
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s enkripsi akan digunakan\n"
diff --git a/po/it.po b/po/it.po
index cd3544788..c2986c350 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: [email protected]\n"
-"POT-Creation-Date: 2006-12-04 15:05+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2004-06-16 17:01+0200\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -40,10 +40,10 @@ msgstr "scrittura della chiave segreta in `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
+#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -77,9 +77,9 @@ 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:481 g10/gpg.c:1008 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
+#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
+#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
@@ -396,15 +396,15 @@ msgstr "la chiave segreta non � disponibile"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
+#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "impossibile fare questo in modo batch\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
+#: g10/keygen.c:1456
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
@@ -583,8 +583,8 @@ msgstr "   (%d) RSA (cifra solo)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
+#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
@@ -608,7 +608,7 @@ msgstr "Parti della chiave segreta non sono disponibili.\n"
 msgid "secret key already stored on a card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1319 g10/keyedit.c:1351
 msgid "quit this menu"
 msgstr "abbandona questo men�"
 
@@ -617,7 +617,7 @@ msgstr "abbandona questo men�"
 msgid "show admin commands"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1322 g10/keyedit.c:1354
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
@@ -674,7 +674,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1457 g10/keyedit.c:1617
 msgid "Command> "
 msgstr "Comando> "
 
@@ -693,7 +693,7 @@ msgstr "comandi in conflitto\n"
 msgid "Admin commands are not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1602 g10/keyedit.c:2238
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
@@ -748,7 +748,7 @@ msgstr "Ripeti la passphrase: "
 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:3868 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -758,7 +758,7 @@ 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:3392 g10/keyserver.c:1705
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3386 g10/keyserver.c:1705
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -807,7 +807,7 @@ msgstr "c'� una chiave segreta per la chiave pubblica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "usa prima l'opzione \"--delete-secret-keys\" per cancellarla.\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:213 g10/sign.c:1286
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
@@ -884,12 +884,12 @@ msgstr "non � possibile usare %s in modalit� %s\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrato per: \"%s\"\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:292
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dati cifrati con %s\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:296
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
@@ -1034,7 +1034,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:378
+#: g10/gpg.c:379
 msgid ""
 "@Commands:\n"
 " "
@@ -1042,128 +1042,128 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/gpg.c:380
+#: g10/gpg.c:381
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:383
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:394
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "remove keys from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "remove keys from the secret keyring"
 msgstr "rimuove le chiavi dal portachiavi privato"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "sign a key locally"
 msgstr "firma una chiave localmente"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:404
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:408
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:409
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "search for keys on a key server"
 msgstr "cerca delle chiavi su un key server"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:413
 msgid "update all keys from a keyserver"
 msgstr "aggiorna tutte le chiavi da un key server"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:417
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/gpg.c:419
+#: g10/gpg.c:420
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:421
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:422
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/gpg.c:437
+#: g10/gpg.c:438
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/gpg.c:441 g10/gpgv.c:71
+#: g10/gpg.c:442 g10/gpgv.c:70
 msgid ""
 "@\n"
 "Options:\n"
@@ -1173,51 +1173,51 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/gpg.c:445
+#: g10/gpg.c:446
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:458
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/gpg.c:462
+#: g10/gpg.c:463
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:477
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/gpg.c:478 g10/gpgv.c:73
+#: g10/gpg.c:479 g10/gpgv.c:72
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:491
 msgid "prompt before overwriting"
 msgstr "chiede prima di sovrascrivere"
 
-#: g10/gpg.c:531
+#: g10/gpg.c:532
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:532
+#: g10/gpg.c:533
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1225,7 +1225,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/gpg.c:564
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1245,15 +1245,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/gpg.c:763 g10/gpgv.c:98
+#: g10/gpg.c:766 g10/gpgv.c:97
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:783
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1263,7 +1263,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/gpg.c:794
+#: g10/gpg.c:797
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1271,582 +1271,587 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid "Pubkey: "
 msgstr "A chiave pubblica: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2310
+#: g10/gpg.c:806 g10/keyedit.c:2304
 msgid "Cipher: "
 msgstr "Cifrari: "
 
-#: g10/gpg.c:809
+#: g10/gpg.c:812
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2356
+#: g10/gpg.c:818 g10/keyedit.c:2350
 msgid "Compression: "
 msgstr "Compressione: "
 
-#: g10/gpg.c:898
+#: g10/gpg.c:901
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/gpg.c:1046
+#: g10/gpg.c:1049
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1067
 #, 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:1261
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, 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:1279
+#: g10/gpg.c:1282
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1288
 #, 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:1288
+#: g10/gpg.c:1291
 #, 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:1291
+#: g10/gpg.c:1294
 #, 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:1297
+#: g10/gpg.c:1300
 #, 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:1300
+#: g10/gpg.c:1303
 #, 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:1303
+#: g10/gpg.c:1306
 #, 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:1444
+#: g10/gpg.c:1447
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1954
+#: g10/gpg.c:1957
 #, 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:1996
+#: g10/gpg.c:1999
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/gpg.c:2000
+#: g10/gpg.c:2003
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/gpg.c:2007
+#: g10/gpg.c:2010
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/gpg.c:2236
+#: g10/gpg.c:2239
 #, 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:2402 g10/gpg.c:2414
+#: g10/gpg.c:2405 g10/gpg.c:2417
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2494
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "%s non � un set di caratteri valido\n"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/gpg.c:2768
+#: g10/gpg.c:2773
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2771
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/gpg.c:2858
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2875
 #, 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:2880
+#: g10/gpg.c:2890
 #, 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:2894
+#: g10/gpg.c:2904
 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:2900
+#: g10/gpg.c:2910
 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:2906
+#: g10/gpg.c:2916
 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:2919
+#: g10/gpg.c:2929
 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:2986 g10/gpg.c:3010
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:2992 g10/gpg.c:3016
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:2998
+#: g10/gpg.c:3008
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:3004
+#: g10/gpg.c:3014
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3029
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3031
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3033
 #, 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:3025
+#: g10/gpg.c:3035
 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:3027
+#: g10/gpg.c:3037
 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:3030
+#: g10/gpg.c:3040
 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:3034
+#: g10/gpg.c:3044
 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:3041
+#: g10/gpg.c:3051
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3060
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3064
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/gpg.c:3058
+#: g10/gpg.c:3068
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/gpg.c:3091
+#: g10/gpg.c:3101
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3148
 #, 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:3143
+#: g10/gpg.c:3153
 #, 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:3148
+#: g10/gpg.c:3158
 #, 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:3250
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3271
 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:3272
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3291
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3314
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3306
+#: g10/gpg.c:3316
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3319
 #, 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:3327
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3365
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3367
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3370
 #, 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:3380
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3426
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/gpg.c:3560
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3572
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/gpg.c:3564
+#: g10/gpg.c:3574
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3585
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3595
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3644
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/gpg.c:3854
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/gpg.c:3858
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4172
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL della politica di certificazione indicato non � valido\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4174
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4207
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
@@ -1871,43 +1876,43 @@ msgstr ""
 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:2380 g10/keyedit.c:3712
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, 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:2611
+#: g10/getkey.c:2614
 #, 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:2658
+#: g10/getkey.c:2661
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:73
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "take the keys from this keyring"
 msgstr "prende le chiavi da questo portachiavi"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:76
 msgid "make timestamp conflicts only a warning"
 msgstr "segnala i conflitti di data solo con un avvertimento"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:77
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato sul FD"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:101
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opzioni] [file] (-h per l'aiuto)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:104
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2443,7 +2448,7 @@ msgstr "chiave %08lX: nuova chiave - saltata\n"
 msgid "no writable keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi scrivibile: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
@@ -2804,42 +2809,42 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
+#: g10/keyedit.c:890 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare? (s/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
+#: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  Impossibile firmarla.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "L'user ID \"%s\" � scaduto."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "L'user ID \"%s\" non � autofirmato."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "L'user ID \"%s\" non � autofirmato."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2848,11 +2853,11 @@ msgstr ""
 "L'autofirma su \"%s\"\n"
 "� una firma in stile PGP 2.x.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Vuoi promuoverla in una autofirma di OpenPGP? (s/N) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2861,11 +2866,11 @@ msgstr ""
 "La tua firma attuale su \"%s\"\n"
 "� scaduta\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Vuoi fare una nuova firma per sostituire quella scaduta? (s/N) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2874,43 +2879,43 @@ msgstr ""
 "La tua firma attuale su \"%s\"\n"
 "� una firma locale.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Vuoi trasformarla in una firma completa esportabile? (s/N) "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" era gi� stato firmato localmente dalla chiave %08lX\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" era gi� stato firmato dalla chiave %08lX\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare di nuovo? (s/N) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Niente da firmare con la chiave %08lX\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Questa chiave � scaduta!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Questa chiave scadr� il %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Vuoi che la tua firma scada nello stesso momento? (S/n) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:883
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2918,11 +2923,11 @@ msgstr ""
 "In modalit� -pgp2 non � possibile fare firme OpenPGP su chiavi in stile PGP "
 "2.x.\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:885
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Questo renderebbe la chiave non utilizzabile da PGP 2.x.\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:910
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2932,32 +2937,32 @@ msgstr ""
 "appartiene veramente alla persona indicata sopra?\n"
 "Se non sai cosa rispondere digita \"0\".\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Preferisco non rispondere.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Non l'ho controllata per niente.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) L'ho controllata superficialmente.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) L'ho controllata molto attentamente.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:927
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Cosa scegli? (inserisci '?' per ulteriori informazioni): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:951
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2966,100 +2971,100 @@ msgstr ""
 "Sei davvero sicuro di volere firmare questa chiave\n"
 "con la tua chiave: \""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:958
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Questa sar� una autofirma.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "ATTENZIONE: la firma non sar� marcata come non esportabile.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:972
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "ATTENZIONE: la firma sar� marcata come irrevocabile.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:982
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La firma sar� marcata come non esportabile.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:989
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La firma sar� marcata come irrevocabile.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Non ho controllato per niente questa chiave.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1001
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Ho controllato questa chiave superficialmente.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1006
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Ho controllato questa chiave molto attentamente.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1016
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
-#: g10/keyedit.c:5004 g10/sign.c:352
+#: g10/keyedit.c:1061 g10/keyedit.c:4793 g10/keyedit.c:4884 g10/keyedit.c:4948
+#: g10/keyedit.c:5009 g10/sign.c:351
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1126
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1137 g10/keygen.c:3215
 msgid "This key is not protected.\n"
 msgstr "Questa chiave non � protetta.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1145 g10/keygen.c:3218
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1149 g10/keygen.c:3222
 msgid "Key is protected.\n"
 msgstr "La chiave � protetta.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1173
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossibile modificare questa chiave: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1179
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3067,11 +3072,11 @@ msgstr ""
 "Inserisci la nuova passphrase per questa chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1188 g10/keygen.c:1895
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1193
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3079,206 +3084,206 @@ msgstr ""
 "Non vuoi una passphrase - questa � probabilmente una *cattiva* idea!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1196
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vuoi veramente farlo?"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1267
 msgid "moving a key signature to the correct place\n"
 msgstr "spostamento della firma di una chiave nel posto corretto\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1353
 msgid "save and quit"
 msgstr "salva ed esci"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1356
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1357
 msgid "list key and user IDs"
 msgstr "elenca le chiavi e gli user ID"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1359
 msgid "select user ID N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1360
 #, fuzzy
 msgid "select subkey N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1361
 #, fuzzy
 msgid "check signatures"
 msgstr "revoca firme"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1366
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "firma la chiave localmente"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1379
 msgid "add a user ID"
 msgstr "aggiungi un user ID"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1381
 msgid "add a photo ID"
 msgstr "aggiungi un ID fotografico"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1383
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "cancella un user ID"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1388
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1392
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1394
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1396
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "cancella una chiave secondaria"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1402
 msgid "add a revocation key"
 msgstr "aggiungi una chiave di revoca"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Non � possibile cambiare la data di scadenza di una chiave v3\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "imposta l'user ID come primario"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1413
 msgid "list preferences (expert)"
 msgstr "elenca le preferenze (per esperti)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1415
 msgid "list preferences (verbose)"
 msgstr "elenca le preferenze (prolisso)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "cambia il valore di fiducia"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Revoco davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revoca un user ID"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoca una chiave secondaria"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "abilita una chiave"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "disabilita una chiave"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostra l'ID fotografico"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1446
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1564
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "errore leggendo il keyblock segreto `%s': %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1582
 msgid "Secret key is available.\n"
 msgstr "� disponibile una chiave segreta.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1663
 msgid "Need the secret key to do this.\n"
 msgstr "Per fare questo serve la chiave segreta.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1671
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Per favore usa prima il comando \"toggle\".\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1690
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3286,241 +3291,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1730
 msgid "Key is revoked."
 msgstr "La chiave � stata revocata."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1749
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Firmo davvero tutti gli user ID? "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1756
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1765
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe della firma sconosciuta"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1788
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Questo comando non � permesso in modalit� %s.\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
 msgid "You must select at least one user ID.\n"
 msgstr "Devi selezionare almeno un user ID.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1812
 msgid "You can't delete the last user ID!\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1814
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Tolgo davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1815
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1865
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1877
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1905
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "errore creando il portachiavi `%s': %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1960
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1963
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vuoi davvero cancellare le chiavi selezionate? "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1964
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vuoi davvero cancellare questa chiave? "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:1999
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Revoco davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2000
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Revoco davvero questo user ID? "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2018
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2029
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vuoi davvero revocare le chiavi selezionate? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2081
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2123
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "imposta la lista di preferenze"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Aggiorno davvero le preferenze? "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2199
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvo i cambiamenti? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2202
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Esco senza salvare? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2212
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2226
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2327
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2379
 msgid "Features: "
 msgstr "Caratteristiche: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2390
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2405 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2413 g10/keyedit.c:2414
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2624
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Non esistono preferense su un user ID in stile PGP 2.x\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2683
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Questa chiave pu� essere revocata dalla chiave %s "
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2704
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Questa chiave pu� essere revocata dalla chiave %s "
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2710
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensibile)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keyedit.c:2726 g10/keyedit.c:2782 g10/keyedit.c:2843 g10/keyedit.c:2858
 #: g10/keylist.c:194 g10/keyserver.c:511
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "impossibile creare %s: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2729 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2731 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2733 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2735
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2754
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2761
 msgid "This key has been disabled"
 msgstr "Questa chiave � stata disabilitata"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2789 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2813
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3529,19 +3534,19 @@ msgstr ""
 "corretta\n"
 "finch� non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2944
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3550,7 +3555,7 @@ msgstr ""
 "            potrebbe fare diventare un altro user ID il primario "
 "predefinito.\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3005
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3559,76 +3564,76 @@ msgstr ""
 "ATTENZIONE: Questa � una chiave in stile PGP2. Aggiungere un ID fotografico\n"
 "            pu� causarne il rifiuto da parte di alcune versioni di PGP.\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3351
+#: g10/keyedit.c:3010 g10/keyedit.c:3345
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3016
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Non � possibile aggiungere un ID fotografico a una chiave in stile PGP2.\n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3156
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3166
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3170
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3176
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3190
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3191
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3194
 msgid "Nothing deleted.\n"
 msgstr "Non � stato cancellato nulla.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3227 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "armatura non valida"
 
-#: g10/keyedit.c:3235
+#: g10/keyedit.c:3229
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:3242
+#: g10/keyedit.c:3236
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3237
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3246
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3340
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3638,381 +3643,381 @@ msgstr ""
 "            designato pu� causarne il rifiuto da parte di alcune versioni\n"
 "            di PGP.\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3351
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Non � possibile aggiungere un revocatore designato a una chiave in stile\n"
 "PGP 2.x.\n"
 
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3371
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Inserisci l'user ID del revocatore designato: "
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3396
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "impossibile nominare come revocatore designato una chiave in stile PGP 2.x\n"
 
-#: g10/keyedit.c:3417
+#: g10/keyedit.c:3411
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "impossibile nominare una chiave come revocatore designato di s� stessa\n"
 
-#: g10/keyedit.c:3439
+#: g10/keyedit.c:3433
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "ATTENZIONE: questa chiave � stata revocata dal suo revocatore designato!\n"
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3452
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "ATTENZIONE: la nomina di una chiave a revocatrice designata non pu� essere\n"
 "annullata.\n"
 
-#: g10/keyedit.c:3464
+#: g10/keyedit.c:3458
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Sei sicuro di volere nominare questa chiave revocatrice designata? (s/N):"
 
-#: g10/keyedit.c:3525
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:3531
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:3538
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3582
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Non � possibile cambiare la data di scadenza di una chiave v3\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3598
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3678
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "ATTENZIONE: la sottochiave per firme %08lX non ha una certificature "
 "incrociata\n"
 
-#: g10/keyedit.c:3679
+#: g10/keyedit.c:3684
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3841
+#: g10/keyedit.c:3846
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare esattamente un user ID.\n"
 
-#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
+#: g10/keyedit.c:3885 g10/keyedit.c:3995 g10/keyedit.c:4115 g10/keyedit.c:4256
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "salto una autofirma v3 sull'user ID \"%s\"\n"
 
-#: g10/keyedit.c:4051
+#: g10/keyedit.c:4056
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4131
+#: g10/keyedit.c:4136
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:4132
+#: g10/keyedit.c:4137
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4199
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Annotazione della firma: "
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4348
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Sovrascrivo (s/N)? "
 
-#: g10/keyedit.c:4407
+#: g10/keyedit.c:4412
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4470
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4492
+#: g10/keyedit.c:4497
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4627
+#: g10/keyedit.c:4632
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4635 g10/keyedit.c:4699 g10/keyedit.c:4742
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   firmata da %08lX il %s%s%s\n"
 
-#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4641
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave � scaduta il %s.\n"
 
-#: g10/keyedit.c:4640
+#: g10/keyedit.c:4645
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:4644
+#: g10/keyedit.c:4649
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creare un certificato di revoca per questa firma? (s/N) "
 
-#: g10/keyedit.c:4671
+#: g10/keyedit.c:4676
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:4697
+#: g10/keyedit.c:4702
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4709
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4731
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:4746
+#: g10/keyedit.c:4751
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4781
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:4846
+#: g10/keyedit.c:4851
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:4863
+#: g10/keyedit.c:4868
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "ATTENZIONE: una firma dell'user ID ha la data di %d secondi nel futuro\n"
 
-#: g10/keyedit.c:4927
+#: g10/keyedit.c:4932
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:4989
+#: g10/keyedit.c:4994
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:5084
+#: g10/keyedit.c:5089
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Mostro %s ID fotografici di dimensioni %ld per la chaive 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "la preferenza %c%lu � doppia\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "ci sono troppe preferenze `%c'\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "ci sono troppe preferenze `%c'\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "ci sono troppe preferenze `%c'\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:876
 msgid "writing direct signature\n"
 msgstr "scrittura della firma diretta\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:915
 msgid "writing self signature\n"
 msgstr "scrittura della autofirma\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:965
 msgid "writing key binding signature\n"
 msgstr "scrittura della firma di collegamento alla chiave\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
+#: g10/keygen.c:2776
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "dimensione della chiave non valida; uso %u bit\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dimensioni della chiave arrotondate a %u bit\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1331
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1334
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1337
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifra dati"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1340
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1348
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1367
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1371
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1376
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1379
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1382
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1385
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1441
 msgid "Please select what kind of key you want:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1443
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (default)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (firma solo)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1453
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1522
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "La coppia DSA avr� 1024 bit.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1532
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1539
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Di che dimensioni vuoi la chiave? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1553
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1559
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La dimensione richiesta della chiave � %u bit\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1564 g10/keygen.c:1569
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1618
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4028,7 +4033,7 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1629
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4044,40 +4049,40 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Firma valida per? (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1673
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1680
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s non ha scadenza\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s non ha scadenza\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1686
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s scadr� il %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1687
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Questa firma scadr� il %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1693
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4085,12 +4090,12 @@ msgstr ""
 "Il tuo sistema non pu� mostrare date oltre il 2038.\n"
 "Comunque, sar� gestita correttamente fino al 2106.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1698
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "� giusto (s/n)? "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1713
 #, fuzzy
 msgid ""
 "\n"
@@ -4107,44 +4112,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1726
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non pu� iniziare con una cifra\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1738
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1746
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1752
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non � valido\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1760
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1766
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1789
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Stai usando il set di caratteri `%s'.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1795
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4155,7 +4160,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1800
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
 
@@ -4170,23 +4175,23 @@ msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1826
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:1846
 msgid "Please correct the error first\n"
 msgstr "Per favore correggi prima l'errore\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1886
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4194,12 +4199,12 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:1896 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1902
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4211,7 +4216,7 @@ msgstr ""
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:1924
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4223,50 +4228,50 @@ msgstr ""
 "dischi) durante la generazione dei numeri primi; questo da al generatore di\n"
 "numeri casuali migliori possibilit� di raccogliere abbastanza entropia.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2722
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:2921 g10/keygen.c:3068
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scrittura della chiave pubblica in `%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:2923 g10/keygen.c:3071
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:2926 g10/keygen.c:3074
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3057
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi pubblico scrivibile: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3063
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi segreto scrivibile: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3081
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3088
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3111
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3122
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4276,12 +4281,12 @@ msgstr ""
 "il comando \"--edit-key\" per generare una chiave secondaria per questo "
 "scopo.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4289,7 +4294,7 @@ msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4297,26 +4302,26 @@ msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3197 g10/keygen.c:3326
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NB: la creazione di subchiavi per chiavi v3 non rispetta OpenPGP.\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3236 g10/keygen.c:3359
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crea davvero? "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3524
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3571
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3597
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chiave %08lX scaduta il %s\n"
@@ -4604,207 +4609,211 @@ msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:239
 #, 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:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "chiave di sessione cifrata con %s\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:300
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:381
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "la chiave pubblica � %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:438
 msgid "public key encrypted data: good DEK\n"
 msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:471
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:475 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                alias \""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:479
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Cifrato con la chiave %s con ID %08lX\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:493
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:507
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifratto con %lu passphrase\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:509
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifratto con 1 passphrase\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:540 g10/mainproc.c:562
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suppongo che i dati siano cifrati con %s\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:548
 #, 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:581
+#: g10/mainproc.c:580
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:584
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATTENZIONE: l'integrit� del messaggio non era protetta\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:597
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato � stato manipolato!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:603
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:624
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:626
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:711
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr ""
+
+#: g10/mainproc.c:839
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1187
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1430
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1539
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "impossibile gestire queste firme multiple\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1550
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                alias \""
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1555
 #, 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:1544
+#: g10/mainproc.c:1575
 msgid "Key available at: "
 msgstr "Chiave disponibile presso: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma scaduta da \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr "[incerta]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1797
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1895
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1900
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Questa firma scadr� il %s\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1903
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr "modo testo"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
 msgstr "non � una firma separata\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:2037
 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:2013
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
@@ -4942,18 +4951,18 @@ msgstr ""
 msgid "directory `%s' created\n"
 msgstr "%s: directory creata\n"
 
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:143
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:713
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "ATTENZIONE: la chiave di sessione cifrata simmetricamente � potenzialmente\n"
 "non sicura\n"
 
-#: g10/parse-packet.c:1159
+#: g10/parse-packet.c:1164
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
@@ -5730,12 +5739,12 @@ msgstr ""
 "lunga).\n"
 "Usata inespansa.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:346
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:355
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "Firma %s da: \"%s\"\n"
@@ -5757,12 +5766,12 @@ msgstr ""
 msgid "signing:"
 msgstr "firma:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1101
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "In modalit� -pgp2 puoi firmare in chiaro solo con chiavi in stile PGP 2.x\n"
 
-#: g10/sign.c:1278
+#: g10/sign.c:1280
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "sar� usato il cifrario %s\n"
diff --git a/po/ja.po b/po/ja.po
index e1bcd86a7..d9df4c962 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: [email protected]\n"
-"POT-Creation-Date: 2006-12-04 15:05+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2004-11-23 11:14+0900\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -43,10 +43,10 @@ msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
+#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -79,9 +79,9 @@ msgstr "��%s�פ��ɤ�ޤ���: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "����: random_seed �ե�����ι����򤷤ޤ���\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
+#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
+#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
@@ -390,14 +390,14 @@ msgstr "OpenPGP�����ɤ�̵���Ǥ�: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP������no. %s�򸡽�\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
+#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "����ϥХå����⡼�ɤǤϤǤ��ޤ���\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
+#: g10/keygen.c:1456
 msgid "Your selection? "
 msgstr "�����? "
 
@@ -563,8 +563,8 @@ msgstr "   (2) �Ź沽��\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) ǧ�ڸ�\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
+#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "̵��������Ǥ���\n"
 
@@ -584,7 +584,7 @@ msgstr "������̩��ʬ��̵���Ǥ�\n"
 msgid "secret key already stored on a card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1319 g10/keyedit.c:1351
 msgid "quit this menu"
 msgstr "���Υ�˥塼��λ"
 
@@ -592,7 +592,7 @@ msgstr "���Υ�˥塼��λ"
 msgid "show admin commands"
 msgstr "�������ޥ�ɤ�ɽ��"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1322 g10/keyedit.c:1354
 msgid "show this help"
 msgstr "���Υإ�פ�ɽ��"
 
@@ -644,7 +644,7 @@ msgstr "PIN�֥��å��β�����ѹ��Υ�˥塼"
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1457 g10/keyedit.c:1617
 msgid "Command> "
 msgstr "���ޥ��> "
 
@@ -660,7 +660,7 @@ msgstr "�������ޥ�ɤ����Ĥ���Ƥ��ޤ�\n"
 msgid "Admin commands are not allowed\n"
 msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1602 g10/keyedit.c:2238
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 
@@ -717,7 +717,7 @@ msgstr "PIN�������: "
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -727,7 +727,7 @@ 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:3392 g10/keyserver.c:1705
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3386 g10/keyserver.c:1705
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -773,7 +773,7 @@ msgstr "���θ������ˤ���������̩����%s�ɤ�����ޤ�!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "�ޤ���--delete-secret-keys�ɥ��ץ����Ǥ���������Ƥ���������\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:213 g10/sign.c:1286
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
@@ -839,12 +839,12 @@ msgstr "%s��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s�Ź沽 ������:��%s��\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:292
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s�Ź沽�Ѥߥǡ���\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:296
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "̤�ΤΥ��르�ꥺ��%d�ˤ��Ź沽\n"
@@ -982,7 +982,7 @@ msgstr "�ٹ�: ��̩��%s�ˤϡ�ñ���SK�����å����ब����ޤ���\n"
 msgid "WARNING: nothing exported\n"
 msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:379
 msgid ""
 "@Commands:\n"
 " "
@@ -990,127 +990,127 @@ msgstr ""
 "@���ޥ��:\n"
 " "
 
-#: g10/gpg.c:380
+#: g10/gpg.c:381
 msgid "|[file]|make a signature"
 msgstr "|[�ե�����]|��̾�����"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "|[file]|make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:383
 msgid "make a detached signature"
 msgstr "ʬΥ��̾�����"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "encrypt data"
 msgstr "�ǡ�����Ź沽"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "encryption only with symmetric cipher"
 msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "decrypt data (default)"
 msgstr "�ǡ��������� (����)"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "verify a signature"
 msgstr "��̾�򸡾�"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "list keys"
 msgstr "�����"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:394
 msgid "list keys and signatures"
 msgstr "���Ƚ�̾�ΰ���"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "list and check key signatures"
 msgstr "����̾�θ����Ȱ���"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "list keys and fingerprints"
 msgstr "���Ȼ���ΰ���"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "list secret keys"
 msgstr "��̩���ΰ���"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "generate a new key pair"
 msgstr "��������������"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "remove keys from the public keyring"
 msgstr "�������ؤ��鸰������"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "remove keys from the secret keyring"
 msgstr "��̩���ؤ��鸰������"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "sign a key"
 msgstr "���˽�̾"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "sign a key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:404
 msgid "sign or edit a key"
 msgstr "���ؤν�̾���Խ�"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "generate a revocation certificate"
 msgstr "���������������"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "export keys"
 msgstr "����񤭽Ф�"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:408
 msgid "export keys to a key server"
 msgstr "�������С��˸���񤭽Ф�"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:409
 msgid "import keys from a key server"
 msgstr "�������С����鸰���ɤ߹���"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "search for keys on a key server"
 msgstr "�������С��θ��򸡺�����"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:413
 msgid "update all keys from a keyserver"
 msgstr "�������С����鸰��������������"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:417
 msgid "import/merge keys"
 msgstr "�����ɹ���/ʻ��"
 
-#: g10/gpg.c:419
+#: g10/gpg.c:420
 msgid "print the card status"
 msgstr "�����ɾ��֤�ɽ��"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:421
 msgid "change data on a card"
 msgstr "�����ɤΥǡ������ѹ�"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:422
 msgid "change a card's PIN"
 msgstr "�����ɤ�PIN���ѹ�"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "update the trust database"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: g10/gpg.c:437
+#: g10/gpg.c:438
 msgid "|algo [files]|print message digests"
 msgstr "|���르�ꥺ�� [�ե�����]|��å����������ɽ��"
 
-#: g10/gpg.c:441 g10/gpgv.c:71
+#: g10/gpg.c:442 g10/gpgv.c:70
 msgid ""
 "@\n"
 "Options:\n"
@@ -1120,55 +1120,55 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "create ascii armored output"
 msgstr "ASCII���������������"
 
-#: g10/gpg.c:445
+#: g10/gpg.c:446
 msgid "|NAME|encrypt for NAME"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "��̾������ˤ��Υ桼����id\n"
 "�����"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:458
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|���̥�٥��N������\n"
 "(0���󰵽�)"
 
-#: g10/gpg.c:462
+#: g10/gpg.c:463
 msgid "use canonical text mode"
 msgstr "����ƥ����ȡ��⡼�ɤ����"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:477
 msgid "use as output file"
 msgstr "���ϥե�����Ȥ��ƻ���"
 
-#: g10/gpg.c:478 g10/gpgv.c:73
+#: g10/gpg.c:479 g10/gpgv.c:72
 msgid "verbose"
 msgstr "��Ĺ"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "do not make any changes"
 msgstr "̵�ѹ�"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:491
 msgid "prompt before overwriting"
 msgstr "������˳�ǧ"
 
-#: g10/gpg.c:531
+#: g10/gpg.c:532
 msgid "use strict OpenPGP behavior"
 msgstr "��̩��OpenPGP�ο�������"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:533
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x�ߴ��Υ�å�����������"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1177,7 +1177,7 @@ msgstr ""
 "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
 "�ޥ˥奢�롦�ڡ���������������)\n"
 
-#: g10/gpg.c:564
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1197,15 +1197,15 @@ msgstr ""
 " --list-keys [̾��]         ����ɽ��\n"
 " --fingerprint [̾��]       �����ɽ��\n"
 
-#: g10/gpg.c:763 g10/gpgv.c:98
+#: g10/gpg.c:766 g10/gpgv.c:97
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:783
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1215,7 +1215,7 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: g10/gpg.c:794
+#: g10/gpg.c:797
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1223,566 +1223,571 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid "Pubkey: "
 msgstr "������: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2310
+#: g10/gpg.c:806 g10/keyedit.c:2304
 msgid "Cipher: "
 msgstr "�Ź�ˡ: "
 
-#: g10/gpg.c:809
+#: g10/gpg.c:812
 msgid "Hash: "
 msgstr "�ϥå���: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2356
+#: g10/gpg.c:818 g10/keyedit.c:2350
 msgid "Compression: "
 msgstr "����: "
 
-#: g10/gpg.c:898
+#: g10/gpg.c:901
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/gpg.c:1046
+#: g10/gpg.c:1049
 msgid "conflicting commands\n"
 msgstr "��Ω���륳�ޥ��\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1067
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=���椬�����롼�������%s����˸��Ĥ���ޤ���\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1276
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1288
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1300
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1444
+#: g10/gpg.c:1447
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "̤�Τι������ܡ�%s��\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "��̩���ȸ������ΰ�����ȿž"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1954
+#: g10/gpg.c:1957
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
 
-#: g10/gpg.c:1996
+#: g10/gpg.c:1999
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
-#: g10/gpg.c:2000
+#: g10/gpg.c:2003
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: g10/gpg.c:2007
+#: g10/gpg.c:2010
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s�ϻȤ��ޤ���!\n"
 
-#: g10/gpg.c:2236
+#: g10/gpg.c:2239
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "�����Ǥʤ����ĤΤ��ᡢ�Ź�ˡ��ĥ��%s�פ�����ɤ��ޤ���\n"
 
-#: g10/gpg.c:2402 g10/gpg.c:2414
+#: g10/gpg.c:2405 g10/gpg.c:2417
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2494
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 msgid "could not parse keyserver URL\n"
 msgstr "�������С���URL�������ǽ\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 msgid "invalid keyserver options\n"
 msgstr "̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 msgid "invalid list options\n"
 msgstr "̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2603
 msgid "invalid verify options\n"
 msgstr "̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path��%s��������ǽ\n"
 
-#: g10/gpg.c:2768
+#: g10/gpg.c:2773
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2771
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�ٹ�: %s��%s���ͥ��\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
 
-#: g10/gpg.c:2858
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ�˻ȤäƤ�̵��̣�Ǥ�!\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2875
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: g10/gpg.c:2880
+#: g10/gpg.c:2890
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/gpg.c:2894
+#: g10/gpg.c:2904
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
 
-#: g10/gpg.c:2900
+#: g10/gpg.c:2910
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ沽��Ʊ���ˤǤ��ޤ���\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2916
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 
-#: g10/gpg.c:2919
+#: g10/gpg.c:2929
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź�ˡ��ɬ�פǤ�\n"
 
-#: g10/gpg.c:2986 g10/gpg.c:3010
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:2992 g10/gpg.c:3016
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:2998
+#: g10/gpg.c:3008
 msgid "selected compression algorithm is invalid\n"
 msgstr "���򤵤줿���̥��르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3004
+#: g10/gpg.c:3014
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3029
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3031
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3033
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3035
 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:3027
+#: g10/gpg.c:3037
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "̵����min-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3040
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3044
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3051
 msgid "invalid default preferences\n"
 msgstr "̵���ʴ��������\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3060
 msgid "invalid personal cipher preferences\n"
 msgstr "̵���ʸĿ��ѰŹ�ˡ������\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3064
 msgid "invalid personal digest preferences\n"
 msgstr "̵���ʸĿ������������\n"
 
-#: g10/gpg.c:3058
+#: g10/gpg.c:3068
 msgid "invalid personal compress preferences\n"
 msgstr "̵���ʸĿ��Ѱ��̤�����\n"
 
-#: g10/gpg.c:3091
+#: g10/gpg.c:3101
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3148
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3153
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3158
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3271
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3291
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "��%s�פ��оΰŹ�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3314
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3306
+#: g10/gpg.c:3316
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3319
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "--symmetric --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3365
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3367
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --sign --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3370
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "--symmetric --sign --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/gpg.c:3426
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�桼����id] [����]"
 
-#: g10/gpg.c:3560
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3572
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3564
+#: g10/gpg.c:3574
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3585
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3595
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3644
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
 
-#: g10/gpg.c:3854
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/gpg.c:3858
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å��������ǤäƤ������� ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4172
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4174
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4207
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
@@ -1805,44 +1810,44 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid��ͭ���ˤ��줿̵���ʸ�%s�Ǥ�\n"
 
-#: g10/getkey.c:2380 g10/keyedit.c:3712
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "��������%s�ˤ���������̩����������ޤ��� - ̵��\n"
 
-#: g10/getkey.c:2611
+#: g10/getkey.c:2614
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "����%s��縰%s�����Ѥ��ޤ�\n"
 
-#: g10/getkey.c:2658
+#: g10/getkey.c:2661
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "��%s: �������Τʤ���̩���Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:73
 msgid "be somewhat more quiet"
 msgstr "����Ť�"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "take the keys from this keyring"
 msgstr "���θ����ؤ��������ޤ�"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:76
 msgid "make timestamp conflicts only a warning"
 msgstr "������̷���ٹ�����ˤ��ޤ�"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:77
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
 "�񤭹���"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:101
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpgv [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:104
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2370,7 +2375,7 @@ msgstr "��%s: ���������Ǥ� - �ȤФ��ޤ�\n"
 msgid "no writable keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ��ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "��%s�פؤν����\n"
@@ -2723,42 +2728,42 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "��̾�����¤���ɥ᡼�󤫡�����Τʤ�����enter�����Ϥ��Ƥ���������\n"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
+#: g10/keyedit.c:890 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "����Ǥ⤳�θ��˽�̾�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
+#: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  ��̾��ǽ��\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "�桼����ID��%s�ɤϡ���λ�Ǥ���"
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "�桼����ID��%s�ɤϡ����ʽ�̾����Ƥ��ޤ���"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "�桼����ID��%s�ɤϡ����ʽ�̾����Ƥ��ޤ���"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "�����˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2767,11 +2772,11 @@ msgstr ""
 "��%s�ɤˤ������뼫�ʽ�̾�ϡ�\n"
 "PGP 2.x�����ν�̾�Ǥ���\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "OpenPGP�μ��ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2780,11 +2785,11 @@ msgstr ""
 "��%s�ɤˤ������뤢�ʤ��κ��ν�̾\n"
 "����λ�Ǥ���\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "��������̾��ȯ�Ԥ��������ڤ��̾�ȸ򴹤������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2793,53 +2798,53 @@ msgstr ""
 "��%s�ɤˤ������뤢�ʤ��κ��ν�̾\n"
 "��������̾�Ǥ���\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "��Ф���ǽ�ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "��%s�ɤϸ�%s�Ǥ⤦������̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "��%s�ɤϸ�%s�Ǥ⤦��̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "����Ǥ�ƽ�̾�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "��%s�ǽ�̾���٤���ΤϤ���ޤ���\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "���θ�����λ�Ǥ�!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "���θ���%s����λ���ޤ���\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Ʊ���˽�̾����λ�ˤ������Ǥ���? (Y/n) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:883
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "--pgp2�⡼�ɤǤ�PGP 2.x����OpenPGP��̾���Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:885
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "���θ���PGP 2.x�ǻ��ѤǤ��ʤ��ʤ�ޤ���\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:910
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2848,32 +2853,32 @@ msgstr ""
 "��̾���褦�Ȥ��Ƥ��븰���ºݤ˾嵭��̾���οͤΤ�Τ��ɤ������ɤ�����\n"
 "���դ��Ƹ��ڤ��ޤ�����? �����狼��ʤ���С���0�ɤ����Ϥ��Ƥ���������\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) �����ޤ���%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) �������������Ƥ��ޤ���%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ������������ޤ�����%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ���ʤ����դ��Ƹ������ޤ�����%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:927
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "�����? (�ܺ٤� '?' ��): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:951
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2882,75 +2887,75 @@ msgstr ""
 "�����ˤ��θ��ˤ��ʤ��θ���%s�ɤǽ�̾���Ƥ褤�Ǥ���\n"
 "(%s)\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:958
 msgid "This will be a self-signature.\n"
 msgstr "���ʽ�̾�ˤʤ�Ǥ��礦��\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:964
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "�ٹ�: ��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:972
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "�ٹ�: ��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:982
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:989
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:996
 msgid "I have not checked this key at all.\n"
 msgstr "���θ����������������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1001
 msgid "I have checked this key casually.\n"
 msgstr "���θ��ϰ�����������ޤ�����\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1006
 msgid "I have checked this key very carefully.\n"
 msgstr "���θ��ϡ����ʤ����դ��Ƹ������ޤ�����\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1016
 msgid "Really sign? (y/N) "
 msgstr "�����˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
-#: g10/keyedit.c:5004 g10/sign.c:352
+#: g10/keyedit.c:1061 g10/keyedit.c:4793 g10/keyedit.c:4884 g10/keyedit.c:4948
+#: g10/keyedit.c:5009 g10/sign.c:351
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1126
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1137 g10/keygen.c:3215
 msgid "This key is not protected.\n"
 msgstr "���θ����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1145 g10/keygen.c:3218
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1149 g10/keygen.c:3222
 msgid "Key is protected.\n"
 msgstr "�����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1173
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "���θ����Խ��Ǥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1179
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2958,11 +2963,11 @@ msgstr ""
 "������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1188 g10/keygen.c:1895
 msgid "passphrase not correctly repeated; try again"
 msgstr "�ѥ��ե졼��������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1193
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2971,206 +2976,206 @@ msgstr ""
 "�����餯����ϡ������Ǥ�ʤ����ͤ��Ǥ�!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1196
 msgid "Do you really want to do this? (y/N) "
 msgstr "�����˼¹Ԥ��ޤ���? (y/N) "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1267
 msgid "moving a key signature to the correct place\n"
 msgstr "���ν�̾�����������˰�ư���ޤ�\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1353
 msgid "save and quit"
 msgstr "��¸���ƽ�λ"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1356
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "�����ɽ��"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1357
 msgid "list key and user IDs"
 msgstr "���ȥ桼����ID�ΰ���"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1359
 msgid "select user ID N"
 msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1360
 #, fuzzy
 msgid "select subkey N"
 msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1361
 #, fuzzy
 msgid "check signatures"
 msgstr "��̾�μ���"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1366
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1379
 msgid "add a user ID"
 msgstr "�桼����ID���ɲ�"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1381
 msgid "add a photo ID"
 msgstr "�ե���ID���ɲ�"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1383
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "�桼����ID�κ��"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1388
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1392
 msgid "add a key to a smartcard"
 msgstr "���ޡ��ȥ����ɤظ����ɲ�"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1394
 msgid "move a key to a smartcard"
 msgstr "���ޡ��ȥ����ɤθ��ؤΰ�ư"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "move a backup key to a smartcard"
 msgstr "���ޡ��ȥ����ɤθ��ؤΰ�ư"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "������"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1402
 msgid "add a revocation key"
 msgstr "���������ɲ�"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "�桼����ID���ˤ���"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "��̩���ȸ������ΰ�����ȿž"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1413
 msgid "list preferences (expert)"
 msgstr "�����ΰ��� (�������ѡ���)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1415
 msgid "list preferences (verbose)"
 msgstr "�����ΰ��� (��Ĺ)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "��������������URI������"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "��ͭ�Կ��Ѥ��ѹ�"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "���򤷤����桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "�桼����ID�μ���"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "�������"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "���λ��Ѥ���Ĥ���"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "���λ��Ѥ�ػߤ���"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "�ե���ID��ɽ��"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1446
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1564
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "��̩���֥��å���%s�ɤ��ɽФ����顼: %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1582
 msgid "Secret key is available.\n"
 msgstr "��̩�������ѤǤ��ޤ���\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1663
 msgid "Need the secret key to do this.\n"
 msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1671
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�ޤ���toggle�ɥ��ޥ�ɤ�ȤäƤ���������\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1690
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3178,159 +3183,159 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1730
 msgid "Key is revoked."
 msgstr "���ϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1749
 msgid "Really sign all user IDs? (y/N) "
 msgstr "���������桼����ID�˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1756
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1765
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "̤�Τν�̾���饹�Ǥ�"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1788
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s�⡼�ɤǤ��Υ��ޥ�ɤ϶ػߤǤ���\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
 msgid "You must select at least one user ID.\n"
 msgstr "�桼����ID�򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1812
 msgid "You can't delete the last user ID!\n"
 msgstr "�Ǹ�Υ桼����ID�Ϻ���Ǥ��ޤ���!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1814
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "���򤷤����桼����ID�������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1815
 msgid "Really remove this user ID? (y/N) "
 msgstr "���Υ桼����ID�������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1865
 msgid "Really move the primary key? (y/N) "
 msgstr "���μ縰�������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1877
 msgid "You must select exactly one key.\n"
 msgstr "���򤭤ä���1�����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1905
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "���ء�%s�פκ������顼: %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1960
 msgid "You must select at least one key.\n"
 msgstr "���򾯤ʤ��Ȥ�1�����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1963
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "���򤷤����������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1964
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "���θ��������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:1999
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "���򤷤����桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2000
 msgid "Really revoke this user ID? (y/N) "
 msgstr "���Υ桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2018
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "���θ��������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2029
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "���򤷤����������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "���θ��������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2081
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "���ѼԻ��꿮�ѥǡ����١����������桢��ͭ�Կ��Ѥ����ꤵ��ʤ����Ȥ⤢���"
 "����\n"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2123
 msgid "Set preference list to:\n"
 msgstr "�������������:\n"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2129
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2131
 msgid "Really update the preferences? (y/N) "
 msgstr "�����������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2199
 msgid "Save changes? (y/N) "
 msgstr "�ѹ�����¸���ޤ���? (y/N) "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2202
 msgid "Quit without saving? (y/N) "
 msgstr "��¸�����˽�λ���ޤ���? (y/N) "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2212
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2226
 msgid "Key not changed so no update needed.\n"
 msgstr "����̵�ѹ��ʤΤǹ��������פǤ���\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2327
 msgid "Digest: "
 msgstr "����: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2379
 msgid "Features: "
 msgstr "��ǽ: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2390
 msgid "Keyserver no-modify"
 msgstr "̵�����������С�"
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2405 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "������������: "
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2413 g10/keyedit.c:2414
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3338,71 +3343,71 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2624
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x�����桼����ID��������������ޤ���\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2683
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2704
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2710
 msgid "(sensitive)"
 msgstr "(�ǥꥱ����)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keyedit.c:2726 g10/keyedit.c:2782 g10/keyedit.c:2843 g10/keyedit.c:2858
 #: g10/keylist.c:194 g10/keyserver.c:511
 #, c-format
 msgid "created: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2729 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
 #, c-format
 msgid "revoked: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2731 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "��λ: %s"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2733 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
 #, c-format
 msgid "expires: %s"
 msgstr "��λ: %s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2735
 #, c-format
 msgid "usage: %s"
 msgstr "����ˡ: %s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2750
 #, c-format
 msgid "trust: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2754
 #, c-format
 msgid "validity: %s"
 msgstr "ͭ����: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2761
 msgid "This key has been disabled"
 msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2789 g10/keylist.c:200
 msgid "card-no: "
 msgstr "�������ֹ�: "
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2813
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3410,17 +3415,17 @@ msgstr ""
 "�ץ�������Ƶ�ư����ޤǡ�ɽ�����줿����ͭ�������������ʤ����⤷��ʤ���\n"
 "�Ȥ������Ȥ�ǰƬ�ˤ����Ƥ���������\n"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "����"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "��λ"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2944
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3428,7 +3433,7 @@ msgstr ""
 "�ٹ�: �礿��桼����ID������ޤ��󡣤��Υ��ޥ�ɤϡ��̤�\n"
 "              �桼����ID����ˤʤ�Ȳ��ꤹ���礬����ޤ���\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3005
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3437,75 +3442,75 @@ msgstr ""
 "�ٹ�: �����PGP2�����θ��Ǥ����ե���ID���ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3351
+#: g10/keyedit.c:3010 g10/keyedit.c:3345
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "����Ǥ��ɲä������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3016
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2�����θ��ˤϥե���ID���ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3156
 msgid "Delete this good signature? (y/N/q)"
 msgstr "������������̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3166
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3170
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3176
 msgid "Really delete this self-signature? (y/N)"
 msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3190
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3191
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3194
 msgid "Nothing deleted.\n"
 msgstr "���������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3227 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "̵���������Ǥ�"
 
-#: g10/keyedit.c:3235
+#: g10/keyedit.c:3229
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:3242
+#: g10/keyedit.c:3236
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3237
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3246
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3340
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3514,359 +3519,359 @@ msgstr ""
 "�ٹ�: �����PGP 2.x�����θ��Ǥ�����̾�����Ԥ��ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3351
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x�����θ��ˤϻ�̾�����Ԥ��ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3371
 msgid "Enter the user ID of the designated revoker: "
 msgstr "��̾�����ԤΥ桼����ID�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3396
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x�����θ��ϡ���̾�����Ԥ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3417
+#: g10/keyedit.c:3411
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "��̾�����Ԥˤϡ����θ����Τ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3439
+#: g10/keyedit.c:3433
 msgid "this key has already been designated as a revoker\n"
 msgstr "���θ��ϼ����ԤȤ��Ƥ⤦��̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3452
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "�ٹ�: ���븰���̾�����Ԥ����ꤹ��ȡ������᤻�ޤ���!\n"
 
-#: g10/keyedit.c:3464
+#: g10/keyedit.c:3458
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "�����ˤ��θ����̾�����Ԥ�Ǥ̿���ޤ���? (y/N) "
 
-#: g10/keyedit.c:3525
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "��̩���������Ȥ��Ƥ���������\n"
 
-#: g10/keyedit.c:3531
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "������ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3538
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3582
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3598
 msgid "No corresponding signature in secret ring\n"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3678
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "�ٹ�: ��̾����%s�ϡ���߾����Ǥ���ޤ���\n"
 
-#: g10/keyedit.c:3679
+#: g10/keyedit.c:3684
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3841
+#: g10/keyedit.c:3846
 msgid "Please select exactly one user ID.\n"
 msgstr "�桼����ID�򤭤ä���ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
+#: g10/keyedit.c:3885 g10/keyedit.c:3995 g10/keyedit.c:4115 g10/keyedit.c:4256
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�桼����ID��%s�ɤ�v3���ʽ�̾��ȤФ��ޤ�\n"
 
-#: g10/keyedit.c:4051
+#: g10/keyedit.c:4056
 msgid "Enter your preferred keyserver URL: "
 msgstr "�����������С�URL�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:4131
+#: g10/keyedit.c:4136
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�����˸򴹤������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4132
+#: g10/keyedit.c:4137
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�����˺���������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4199
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "��̾����: "
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4348
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "��񤭤��ޤ���? (y/N) "
 
-#: g10/keyedit.c:4407
+#: g10/keyedit.c:4412
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4470
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4492
+#: g10/keyedit.c:4497
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4627
+#: g10/keyedit.c:4632
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "�桼����ID:��%s��\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4635 g10/keyedit.c:4699 g10/keyedit.c:4742
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s��%s%s%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 msgid " (non-exportable)"
 msgstr " (��Ф��Բ�)"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4641
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���ν�̾��%s����λ�Ǥ���\n"
 
-#: g10/keyedit.c:4640
+#: g10/keyedit.c:4645
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "����Ǥ������˼����������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4644
+#: g10/keyedit.c:4649
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���ν�̾�ˤ������뼺���������������ޤ���? (y/N) "
 
-#: g10/keyedit.c:4671
+#: g10/keyedit.c:4676
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�����Υ桼����ID�˸�%s�ǽ�̾���ޤ���:\n"
 
-#: g10/keyedit.c:4697
+#: g10/keyedit.c:4702
 msgid " (non-revocable)"
 msgstr " (�����Բ�)"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4709
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "���ʤ��θ�%s��%s�˼�������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4731
 msgid "You are about to revoke these signatures:\n"
 msgstr "�����ν�̾�򼺸����褦�Ȥ��Ƥ��ޤ�:\n"
 
-#: g10/keyedit.c:4746
+#: g10/keyedit.c:4751
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "����������������˺������ޤ���? (y/N) "
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4781
 msgid "no secret key\n"
 msgstr "��̩��������ޤ���\n"
 
-#: g10/keyedit.c:4846
+#: g10/keyedit.c:4851
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4863
+#: g10/keyedit.c:4868
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "�ٹ�: �桼����ID��̾����%d��̤��Ǥ�\n"
 
-#: g10/keyedit.c:4927
+#: g10/keyedit.c:4932
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4989
+#: g10/keyedit.c:4994
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:5084
+#: g10/keyedit.c:5089
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s (�礭��%ld) �θ�%s (uid %d) �Υե���ID�Ȥ���ɽ��\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "������%s�פν�ʣ\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 msgid "too many cipher preferences\n"
 msgstr "¿������Ź�ˡ����\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 msgid "too many digest preferences\n"
 msgstr "¿��������������\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 msgid "too many compression preferences\n"
 msgstr "¿�����밵������\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "����ʸ�����̵���ʹ��ܡ�%s�פ�����ޤ�\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:876
 msgid "writing direct signature\n"
 msgstr "ľ�ܽ�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:915
 msgid "writing self signature\n"
 msgstr "���ʽ�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:965
 msgid "writing key binding signature\n"
 msgstr "���б��ؤν�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
+#: g10/keygen.c:2776
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "̵���ʸ�Ĺ��%u�ӥåȤˤ��ޤ�\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��Ĺ��%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1331
 msgid "Sign"
 msgstr "Sign"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1334
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1337
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1340
 msgid "Authenticate"
 msgstr "Authenticate"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1348
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1367
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "��%s�˲�ǽ�����: "
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1371
 msgid "Current allowed actions: "
 msgstr "������ǽ�����: "
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1376
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) ��̾�Ϥ�ȿž\n"
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1379
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) �Ź��Ϥ�ȿž\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1382
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) ǧ���Ϥ�ȿž\n"
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1385
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) ��λ\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1441
 msgid "Please select what kind of key you want:\n"
 msgstr "����˾�θ��μ�������򤷤Ƥ�������:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1443
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA��Elgamal (����)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (�ȼ�ǽ�Ϥ�����)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1448
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (�Ź沽�Τ�)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (�Ź沽�Τ�)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1453
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (�ȼ�ǽ�Ϥ�����)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1522
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA���Ф�1024�ӥåȤˤʤ�ޤ���\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1532
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1539
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�ɤθ�Ĺ�ˤ��ޤ���? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1553
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1559
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�׵ᤵ�줿��Ĺ��%u�ӥå�\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1564 g10/keygen.c:1569
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1618
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3882,7 +3887,7 @@ msgstr ""
 "      <n>m = ���� n ����֤���λ\n"
 "      <n>y = ���� n ǯ�֤���λ\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1629
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3898,40 +3903,40 @@ msgstr ""
 "      <n>m = ��̾�� n ����֤���λ\n"
 "      <n>y = ��̾�� n ǯ�֤���λ\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Key is valid for? (0) "
 msgstr "����ͭ�����֤�? (0)"
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "��̾��ͭ�����֤�? (0)"
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1673
 msgid "invalid value\n"
 msgstr "̵������\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1680
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s��̵���¤Ǥ�\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s��̵���¤Ǥ�\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1686
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s��%s����λ���ޤ�\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1687
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "���ν�̾��%s����λ�Ǥ�\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1693
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3939,11 +3944,11 @@ msgstr ""
 "���Υ����ƥ�Ǥϡ�2038ǯ�ʹߤ����դ�ɽ���Ǥ��ޤ��󤬡�\n"
 "2106ǯ�ޤǤʤ���������갷���ޤ���\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1698
 msgid "Is this correct? (y/N) "
 msgstr "������������Ǥ���? (y/N) "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1713
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3959,44 +3964,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1726
 msgid "Real name: "
 msgstr "��̾: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Invalid character in name\n"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name may not start with a digit\n"
 msgstr "̾��������ǻϤ�ƤϤ����ޤ���\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1738
 msgid "Name must be at least 5 characters long\n"
 msgstr "̾����5ʸ���ʾ�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1746
 msgid "Email address: "
 msgstr "�Żҥ᡼�롦���ɥ쥹: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1752
 msgid "Not a valid email address\n"
 msgstr "ͭ�����Żҥ᡼�롦���ɥ쥹�ǤϤ���ޤ���\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1760
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1766
 msgid "Invalid character in comment\n"
 msgstr "�����Ȥ�̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1789
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "���ʤ���ʸ�������%s�פ�ȤäƤ��ޤ���\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1795
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4007,7 +4012,7 @@ msgstr ""
 "    ��%s��\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1800
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
 
@@ -4022,23 +4027,23 @@ msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1826
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ��Ͻ�λ(Q)? "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ���OK(O)����λ(Q)? "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:1846
 msgid "Please correct the error first\n"
 msgstr "�ޤ����顼�������Ƥ�������\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1886
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4046,12 +4051,12 @@ msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:1896 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1902
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4063,7 +4068,7 @@ msgstr ""
 "�Ρ�--edit-key�ɥ��ץ����Ǥ��ĤǤ��ѹ��Ǥ��ޤ���\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:1924
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4074,50 +4079,50 @@ msgstr ""
 "�Ȥ����ǥ������˥�����������Ȥ���¾�Τ��Ȥ򤹤�ȡ���������Ҥ�\n"
 "�𻨤����礭�ʤ���������������䤹���ʤ�Τǡ������ᤤ�����ޤ���\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2722
 msgid "Key generation canceled.\n"
 msgstr "�������������ä���ޤ�����\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:2921 g10/keygen.c:3068
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "��%s�פظ�������񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:2923 g10/keygen.c:3071
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:2926 g10/keygen.c:3074
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3057
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ������ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3063
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "����߲�ǽ����̩���ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3081
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3088
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "��̩���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3111
 msgid "public and secret key created and signed.\n"
 msgstr "����������̩�������������̾���ޤ�����\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3122
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4126,42 +4131,42 @@ msgstr ""
 "���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n"
 "��--edit-key�ɥ��ޥ�ɤ�Ȥä��������������Ƥ���������\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "���������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3197 g10/keygen.c:3326
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "����: v3���������κ����ϡ�OpenPGP��Ŭ�礷�ޤ���\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3236 g10/keygen.c:3359
 msgid "Really create? (y/N) "
 msgstr "�����˺������ޤ���? (y/N) "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3524
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�����ɤؤθ����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3571
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�Хå����åס��ե������%s�פ������Ǥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3597
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "����: �����ɸ��ΥХå����åפ���%s�פ���¸����ޤ�\n"
@@ -4439,207 +4444,211 @@ msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:239
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "�Ѥ�Ĺ���ΰŹ沽�Ѥߥ��å���� (%d)\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s �Ź沽�Ѥߥ��å����\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:300
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "̤�Τ����󥢥르�ꥺ����������줿�ѥ��ե졼�� %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:381
 #, c-format
 msgid "public key is %s\n"
 msgstr "��������%s�Ǥ�\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:438
 msgid "public key encrypted data: good DEK\n"
 msgstr "�������ˤ��Ź沽�Ѥߥǡ���: ������DEK�Ǥ�\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:471
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "%u-�ӥå�%s��, ID %s, ����%s�˰Ź沽����ޤ���\n"
 
-#: g10/mainproc.c:476 g10/pkclist.c:219
+#: g10/mainproc.c:475 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      ��%s��\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:479
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "%s��, ID %s�ǰŹ沽����ޤ���\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:493
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "������������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:507
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu �ĤΥѥ��ե졼���ǰŹ沽\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:509
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 �ĤΥѥ��ե졼���ǰŹ沽\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:540 g10/mainproc.c:562
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s�Ź沽�Ѥߥǡ�������\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:548
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA�Ź�ˡ��������ǽ�ʤΤǡ���ŷŪ�Ǥ���%s�����Ѥ��褦�Ȥ��Ƥ��ޤ�\n"
 
-#: g10/mainproc.c:581
+#: g10/mainproc.c:580
 msgid "decryption okay\n"
 msgstr "���������\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:584
 msgid "WARNING: message was not integrity protected\n"
 msgstr "�ٹ�: ��å������δ��������ݸ��Ƥ��ޤ���\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:597
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "�ٹ�: �Ź沽���줿��å������ϲ��⤵��Ƥ��ޤ�!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:603
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:624
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "����: �����Ԥϡ����ˤ���ɤ褦�˵��Ƥ��ޤ�\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:626
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "���Υե�����̾='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:711
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr ""
+
+#: g10/mainproc.c:839
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "��Ω��������gpg --import�ɤ�Ȥä�Ŭ�Ѥ��Ƥ�������\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1187
 #, fuzzy
 msgid "no signature found\n"
 msgstr "��%s�ɤ������������̾"
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1430
 msgid "signature verification suppressed\n"
 msgstr "��̾�θ��ڤ��ά\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1539
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "����¿�Ž�̾�ϼ�갷���ޤ���\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1550
 #, c-format
 msgid "Signature made %s\n"
 msgstr "%s�˻ܤ��줿��̾\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1551
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s��%s�����\n"
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1555
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "%s��%s��ID %s�ǻܤ��줿��̾\n"
 
-#: g10/mainproc.c:1544
+#: g10/mainproc.c:1575
 msgid "Key available at: "
 msgstr "�ʲ��˸�������ޤ�: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "��%s�ɤ���� ������ ��̾"
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "��%s�ɤ���δ����ڤ�ν�̾"
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "��%s�ɤ������������̾"
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr "[�Գ���]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1797
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                ��̾��%s��"
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1895
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "�����ڤ�ν�̾ %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1900
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "���ν�̾��%s����λ�Ǥ�\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1903
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr "�Х��ʥ꡼"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr "�ƥ����ȥ⡼��"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 msgid "unknown"
 msgstr "̤�Τ�"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "��̾�򸡺��Ǥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
 msgstr "ʬΥ��̾�Ǥ���ޤ���\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:2037
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "�ٹ�: ¿�Ž�̾�θ��С��ǽ�Τ�Τ����������ޤ���\n"
 
-#: g10/mainproc.c:2013
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���饹0x%02x����Ω��̾\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�Ť����� (PGP 2.x) �ν�̾\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() �����̵���ʥ롼�ȡ��ѥ��åȤ򸡽Ф��ޤ���\n"
 
@@ -4772,16 +4781,16 @@ msgstr "�ٹ�: ��%s�פΥ��ץ����ϵ�ư���Ƥ���֡�ͭ���ˤʤ�ޤ���\n"
 msgid "directory `%s' created\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ��Ǥ��ޤ���\n"
 
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:143
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "�������Υ��르�ꥺ��%d�ϡ���갷���ޤ���\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:713
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "�ٹ�: ����Ū�˷��ݤ��оΰŹ沽���å���󸰤Ǥ�\n"
 
-#: g10/parse-packet.c:1159
+#: g10/parse-packet.c:1164
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
@@ -5496,12 +5505,12 @@ msgid ""
 "unexpanded.\n"
 msgstr "�ٹ�: �����������С�URL��%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:346
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:355
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s��̾����̾��:��%s��\n"
@@ -5520,11 +5529,11 @@ msgstr "�ٹ�: ���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 msgid "signing:"
 msgstr "��̾:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1101
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�PGP 2.x�����θ��ǥ��ꥢ��̾�����Ǥ��ޤ���\n"
 
-#: g10/sign.c:1278
+#: g10/sign.c:1280
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s�Ź沽����Ѥ��ޤ�\n"
diff --git a/po/nb.po b/po/nb.po
index 05f440914..c4243c8bf 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.3\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-12-04 15:05+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2006-06-13 20:31+0200\n"
 "Last-Translator: Trond Endrest�l <[email protected]>\n"
 "Language-Team: Norwegian Bokm�l <[email protected]>\n"
@@ -44,10 +44,10 @@ msgstr "venter p� l�sing av �%s� ...\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
+#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -80,9 +80,9 @@ msgstr "kan ikke lese �%s�: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "merk: random_seed-fila ble ikke oppdatert\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
+#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
+#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
@@ -389,14 +389,14 @@ msgstr "OpenPGP-kort er ikke tilgjengelig: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP-kortnummer %s oppdaget\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
+#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "kan ikke gj�re dette i batchmodus\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
+#: g10/keygen.c:1456
 msgid "Your selection? "
 msgstr "Ditt valg? "
 
@@ -562,8 +562,8 @@ msgstr "   (2) Krypteringsn�kkel\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsn�kkel\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
+#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ugyldig valg.\n"
 
@@ -583,7 +583,7 @@ msgstr "hemmelige deler av n�kkelen er ikke tilgjengelig.\n"
 msgid "secret key already stored on a card\n"
 msgstr "hemmelig n�kkel er allerede lagret p� et kort\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1319 g10/keyedit.c:1351
 msgid "quit this menu"
 msgstr "avslutte denne menyen"
 
@@ -591,7 +591,7 @@ msgstr "avslutte denne menyen"
 msgid "show admin commands"
 msgstr "vise admin-kommandoer"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1322 g10/keyedit.c:1354
 msgid "show this help"
 msgstr "vise denne hjelpen"
 
@@ -643,7 +643,7 @@ msgstr "meny for � endre eller fjerne blokkering av PIN"
 msgid "verify the PIN and list all data"
 msgstr "bekrefte PIN og vise alle data"
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1457 g10/keyedit.c:1617
 msgid "Command> "
 msgstr "Kommando> "
 
@@ -659,7 +659,7 @@ msgstr "Admin-kommandoer er tillatt\n"
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-kommandoer er ikke tillatt\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1602 g10/keyedit.c:2238
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ugyldig kommando  (pr�v �help�)\n"
 
@@ -716,7 +716,7 @@ msgstr "Gjenta denne PIN: "
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN ble ikke gjentatt korrekt; pr�v igjen"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 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,7 +726,7 @@ msgstr "kan ikke �pne �%s�\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output virker ikke for denne kommandoen\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3386 g10/keyserver.c:1705
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -772,7 +772,7 @@ msgstr "det finnes en hemmelig n�kkel for offentlig n�kkel �%s�!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "bruk valget �--delete-secret-keys� for � slette den f�rst.\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:213 g10/sign.c:1286
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
@@ -846,12 +846,12 @@ msgstr "du kan ikke bruke %s i %s modus\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s kryptert for: \"%s\"\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:292
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s krypterte data\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:296
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "kryptert med en ukjent algoritme %d\n"
@@ -987,7 +987,7 @@ msgstr "ADVARSEL: hemmelig n�kkel %s har ikke en enkel SK-sjekksum\n"
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: ingenting eksportert\n"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:379
 msgid ""
 "@Commands:\n"
 " "
@@ -995,127 +995,127 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/gpg.c:380
+#: g10/gpg.c:381
 msgid "|[file]|make a signature"
 msgstr "|[fil]|lage en signatur"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|lage en klartekstsignatur"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:383
 msgid "make a detached signature"
 msgstr "lage en adskilt signatur"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "encrypt data"
 msgstr "kryptere data"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "encryption only with symmetric cipher"
 msgstr "kryptering med bare symmetrisk cipher"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "decrypt data (default)"
 msgstr "dekryptere data (standard)"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "verify a signature"
 msgstr "bekrefte en signatur"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "list keys"
 msgstr "liste n�kler"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:394
 msgid "list keys and signatures"
 msgstr "liste n�kler og signaturer"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "list and check key signatures"
 msgstr "vise og sjekke n�kkelsignaturer"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "list keys and fingerprints"
 msgstr "liste n�kler og fingeravtrykk"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "list secret keys"
 msgstr "liste hemmelige n�kler"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "generate a new key pair"
 msgstr "generere et nytt n�kkelpar"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "remove keys from the public keyring"
 msgstr "fjerne n�kler fra det offentlige n�kkelknippet"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "remove keys from the secret keyring"
 msgstr "fjerne n�kler fra det hemmelige n�kkelknippet"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "sign a key"
 msgstr "signere en n�kkel"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "sign a key locally"
 msgstr "signere en n�kkel lokalt"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:404
 msgid "sign or edit a key"
 msgstr "signere eller redigere en n�kkel"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "generate a revocation certificate"
 msgstr "generere et opphevingssertifikat"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "export keys"
 msgstr "eksportere n�kler"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:408
 msgid "export keys to a key server"
 msgstr "eksportere n�kler til en n�kkelserver"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:409
 msgid "import keys from a key server"
 msgstr "importere n�kler fra en n�kkelserver"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "search for keys on a key server"
 msgstr "s�ke etter n�kler p� en n�kkelserver"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:413
 msgid "update all keys from a keyserver"
 msgstr "oppdatere alle n�klene fra en n�kkelserver"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:417
 msgid "import/merge keys"
 msgstr "importere/flette n�kler"
 
-#: g10/gpg.c:419
+#: g10/gpg.c:420
 msgid "print the card status"
 msgstr "vis kortets status"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:421
 msgid "change data on a card"
 msgstr "endre data p� et kort"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:422
 msgid "change a card's PIN"
 msgstr "endre PIN p� et kort"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "update the trust database"
 msgstr "oppdatere tillitsdatabasen"
 
-#: g10/gpg.c:437
+#: g10/gpg.c:438
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skrive meldingsdigester"
 
-#: g10/gpg.c:441 g10/gpgv.c:71
+#: g10/gpg.c:442 g10/gpgv.c:70
 msgid ""
 "@\n"
 "Options:\n"
@@ -1125,51 +1125,51 @@ msgstr ""
 "Valg:\n"
 " "
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "create ascii armored output"
 msgstr "lage ASCII-beskyttet output"
 
-#: g10/gpg.c:445
+#: g10/gpg.c:446
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAVN|kryptere for NAVN"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "use this user-id to sign or decrypt"
 msgstr "bruke denne brukeriden for signering eller dekryptering"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:458
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sette kompresjonsniv� til N (0 sl�r av kompresjon)"
 
-#: g10/gpg.c:462
+#: g10/gpg.c:463
 msgid "use canonical text mode"
 msgstr "bruk kanonisk tekstmodus"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:477
 msgid "use as output file"
 msgstr "bruk som outputfil"
 
-#: g10/gpg.c:478 g10/gpgv.c:73
+#: g10/gpg.c:479 g10/gpgv.c:72
 msgid "verbose"
 msgstr "fyldig output"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "do not make any changes"
 msgstr "ikke gj�r noen endringer"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:491
 msgid "prompt before overwriting"
 msgstr "sp�r f�r overskriving"
 
-#: g10/gpg.c:531
+#: g10/gpg.c:532
 msgid "use strict OpenPGP behavior"
 msgstr "bruk streng OpenPGP-oppf�rsel"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:533
 msgid "generate PGP 2.x compatible messages"
 msgstr "generere PGP 2.x-kompatible meldinger"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1177,7 +1177,7 @@ msgstr ""
 "@\n"
 "(Se mansiden for en komplett liste over alle kommandoene og valgene)\n"
 
-#: g10/gpg.c:564
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1197,15 +1197,15 @@ msgstr ""
 " --list-keys [navn]         vise n�kler\n"
 " --fingerprint [navn]       vise fingeravtrykk\n"
 
-#: g10/gpg.c:763 g10/gpgv.c:98
+#: g10/gpg.c:766 g10/gpgv.c:97
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Vennligst rapporter feil til <[email protected]>.\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:783
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1215,7 +1215,7 @@ msgstr ""
 "signere, sjekke, kryptere eller dekryptere\n"
 "standard operasjon avhenger av inputdata\n"
 
-#: g10/gpg.c:794
+#: g10/gpg.c:797
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1223,73 +1223,73 @@ msgstr ""
 "\n"
 "St�ttede algoritmer:\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid "Pubkey: "
 msgstr "Offentlig n�kkel: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2310
+#: g10/gpg.c:806 g10/keyedit.c:2304
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:809
+#: g10/gpg.c:812
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2356
+#: g10/gpg.c:818 g10/keyedit.c:2350
 msgid "Compression: "
 msgstr "Kompresjon: "
 
-#: g10/gpg.c:898
+#: g10/gpg.c:901
 msgid "usage: gpg [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: g10/gpg.c:1046
+#: g10/gpg.c:1049
 msgid "conflicting commands\n"
 msgstr "motstridende kommandoer\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1067
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "fant ingen �=�-tegn i gruppedefinisjonen �%s�\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� hjemmekatalogen �%s�\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� utvidelsen �%s�\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1276
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� hjemmekatalogen �%s�\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� utvidelsen �%s�\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1288
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over hjemmekatalogen �%"
 "s�\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1297,20 +1297,20 @@ msgstr ""
 "ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over konfigurasjonsfilen "
 "�%s�\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over utvidelsen �%s�\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1300
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over hjemmekatalogen "
 "�%s�\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1318,476 +1318,480 @@ msgstr ""
 "ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over "
 "konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over utvidelsen �%s�\n"
 
-#: g10/gpg.c:1444
+#: g10/gpg.c:1447
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukjent konfigurasjonspunkt �%s�\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show the keyring name in key listings"
 msgstr "vise navnet til n�kkelknippene i n�kkellister"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1954
+#: g10/gpg.c:1957
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "MERK: den gamle valgfila �%s� ble ignorert\n"
 
-#: g10/gpg.c:1996
+#: g10/gpg.c:1999
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MERK: ingen standard valgfil �%s�\n"
 
-#: g10/gpg.c:2000
+#: g10/gpg.c:2003
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "valgfil �%s�: %s\n"
 
-#: g10/gpg.c:2007
+#: g10/gpg.c:2010
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leser valg fra �%s�\n"
 
-#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MERK: %s er ikke for vanlig bruk!\n"
 
-#: g10/gpg.c:2236
+#: g10/gpg.c:2239
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "cipherutvidelse �%s� ble ikke lastet p� grunn av utrygge rettigheter\n"
 
 # Tenk litt p� denne du, Trond.
-#: g10/gpg.c:2402 g10/gpg.c:2414
+#: g10/gpg.c:2405 g10/gpg.c:2417
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�%s� er ikke en gyldig signaturutg�else\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2494
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�%s� er ikke et gyldig tegnsett\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 msgid "could not parse keyserver URL\n"
 msgstr "kunne ikke parse n�kkelserverens URL\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 msgid "invalid keyserver options\n"
 msgstr "ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importvalg\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "ugyldige importvalg\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listevalg\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 msgid "invalid list options\n"
 msgstr "ugyldige listevalg\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 msgid "show all notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 msgid "show user ID validity during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
+msgid "show only the primary user ID in signature verification"
+msgstr ""
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2603
 msgid "invalid verify options\n"
 msgstr "ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunne ikke sette exec-path til %s\n"
 
-#: g10/gpg.c:2768
+#: g10/gpg.c:2773
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig auto-key-locate-liste\n"
 
-#: g10/gpg.c:2771
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: programmet kan opprette en corefil!\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overstyrere %s\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s er ikke tillatt sammen med %s!\n"
 
-#: g10/gpg.c:2858
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er ikke fornuftig med %s!\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2875
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr ""
 
-#: g10/gpg.c:2880
+#: g10/gpg.c:2890
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2894
+#: g10/gpg.c:2904
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "du kan bare lage adskilte eller klare signaturer i --pgp2-modus\n"
 
-#: g10/gpg.c:2900
+#: g10/gpg.c:2910
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "du kan ikke signere og kryptere samtidig i --pgp2-modus\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2916
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "du m� bruke filer (og ikke en pipe) n�r --pgp2 er p�sl�tt\n"
 
-#: g10/gpg.c:2919
+#: g10/gpg.c:2929
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "kryptering en melding i --pgp2-modus krever IDEA-algoritmen\n"
 
-#: g10/gpg.c:2986 g10/gpg.c:3010
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt krypteringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:2992 g10/gpg.c:3016
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "valg digestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:2998
+#: g10/gpg.c:3008
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt kompresjonsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3004
+#: g10/gpg.c:3014
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt sertifikasjondigestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3029
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m� v�re st�rre enn 0\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3031
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-neede m� v�re st�rre enn 1\n"
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3033
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth m� v�re i intervallet fra 1 til 255\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3035
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldig default-cert-level; m� v�re 0, 1, 2 eller 3\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3037
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ugyldig min-cert-level; m� v�re 0, 1, 2 eller 3\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3040
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MERK: enkel S2K-modus (0) er sterkt frar�det\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3044
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K-modus; m� v�re 0, 1 eller 3\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3051
 msgid "invalid default preferences\n"
 msgstr "ugyldig standard preferanser\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3060
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldig personlig cipherpreferanser\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3064
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldig personlig digestpreferanser\n"
 
-#: g10/gpg.c:3058
+#: g10/gpg.c:3068
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldig personlig kompresjonspreferanser\n"
 
-#: g10/gpg.c:3091
+#: g10/gpg.c:3101
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker ikke enn� med %s\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3148
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "du kan ikke bruke cipheralgoritmen �%s� i %s-modus\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3153
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "du kan ikke bruke digestalgoritmen �%s� i %s-modus\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3158
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "du kan ikke bruke kompresjonsalgoritmen �%s� i %s-modus\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "klarte ikke � initialisere tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3271
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ADVARSEL: mottakere (-r) angitt uten � bruke offentlig n�kkelkryptering\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [filnavn]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3291
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av �%s� mislyktes: %s\n"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3314
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnavn]"
 
-#: g10/gpg.c:3306
+#: g10/gpg.c:3316
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3319
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "du kan ikke bruke --symmtric --encrypt i %s-modus\n"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [filnavn]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3365
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3367
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3370
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "du kan ikke bruke --symmetric --sign --encrypt i %s-modus\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnavn]"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn]"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key brukerid"
 
-#: g10/gpg.c:3426
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key brukerid"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key brukerid [kommandoer]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [brukerid] [n�kkelknippe]"
 
-#: g10/gpg.c:3560
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sending til n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3572
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "mottak fra n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3564
+#: g10/gpg.c:3574
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "n�kkeleksport mislyktes: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3585
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "s�k p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3595
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:3644
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hashalgoritme �%s�\n"
 
-#: g10/gpg.c:3854
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3858
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "Sett i gang og tast inn meldingen din ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4172
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angitte URLen for sertifikasjonspolicyen er ugyldig\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4174
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angitte URLen for signaturpolicy er ugyldig\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4207
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angitte URLen for den foretrukkede n�kkelserveren er ugyldig\n"
 
@@ -1810,42 +1814,42 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Ugyldig n�kkel %s gjort gyldig av --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2380 g10/keyedit.c:3712
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ingen hemmelig undern�kkel for offentlig undern�kkel %s - ignorerer\n"
 
-#: g10/getkey.c:2611
+#: g10/getkey.c:2614
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "bruker undern�kkel %s i stedet for prim�rn�kkel %s\n"
 
-#: g10/getkey.c:2658
+#: g10/getkey.c:2661
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "n�kkel %s: hemmelig n�kkel uten offentlig n�kkel - hoppet over\n"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:73
 msgid "be somewhat more quiet"
 msgstr "v�re noenlunde stille"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "take the keys from this keyring"
 msgstr "hent n�klene fra dette n�kkelknippet"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:76
 msgid "make timestamp conflicts only a warning"
 msgstr "la konflikter mellom tidsstempler bare v�re en advarsel"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:77
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skrive statusinfo til denne FD"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:101
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Bruksm�te: gpgv [valg] [filer] (-h for hjelp)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:104
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2305,7 +2309,7 @@ msgstr "n�kkel %s: ny n�kkel - hoppet over\n"
 msgid "no writable keyring found: %s\n"
 msgstr "ingen skrivbart n�kkelknippe funnet: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til �%s�\n"
@@ -2655,41 +2659,41 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Brukerid �%s� er opphevet."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
+#: g10/keyedit.c:890 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Er du fortsatt sikker p� at du vil signerere den? (j/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
+#: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  Kunne ikke signere.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Brukerid �%s� er utg�tt."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Brukeriden �%s� er ikke selvsignert."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Brukeriden �%s� er signerbar."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 msgid "Sign it? (y/N) "
 msgstr "Signere den? (j/N) "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2698,11 +2702,11 @@ msgstr ""
 "Selvsignaturen p� �%s�\n"
 "er en PGP 2.x-aktig signatur.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Vil du forfremme den til en OpenPGP-selvsignatur? (j/N) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2711,11 +2715,11 @@ msgstr ""
 "Din n�v�rende signatur p� �%s�\n"
 "er utg�tt.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Vil du utstede en ny signatur for � erstatte den som er utg�tt? (j/N) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2724,54 +2728,54 @@ msgstr ""
 "Din n�v�rede signatur p� �%s�\n"
 "er en lokal signatur.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Vil du forfremme den til en fullt eksporterbar signatur? (j/N) "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "�%s� var allerede lokalt signert av n�kkelen %s\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "�%s� var allerede signert av n�kkelen %s\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Vil du likevel signere den igjen? (j/N) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Ingenting � signere med n�kkelen %s\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Denne n�kkelen er utg�tt!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denne n�kkelen utg�r den %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Vil du at signaturen skal utg� p� samme tidspunkt? (J/n) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:883
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Du kan ikke lage en OpenPGP-signatur p� en PGP-2.x-n�kkel i --pgp2-modus.\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:885
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Dette ville gj�re n�kkelen ubrukelig i PGP 2.x.\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:910
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2781,31 +2785,31 @@ msgstr ""
 "tilh�rer den overnevnte personen?  Tast inn �0� dersom du ikke vet\n"
 "svaret.\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Jeg vil ikke svare.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Jeg har ikke sjekket i det hele tatt.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Jeg har gjort en vanlig sjekk.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Jeg har sjekket veldig n�ye.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:927
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ditt valg? (angi �?� for mer informasjon): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:951
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2814,267 +2818,267 @@ msgstr ""
 "Er du virkelig sikker p� at du vil signerere denne n�kkelen med din\n"
 "n�kkel �%s� (%s)\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:958
 msgid "This will be a self-signature.\n"
 msgstr "Dette vil v�re en selvsignatur.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:964
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "ADVARSEL: signaturen vil ikke bli markert som ikke-eksporterbar.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:972
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "ADVARSEL: signaturen vil ikke bli markert som ikke-opphevbar.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:982
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Signaturen vil bli markert som ikke-eksporterbar.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:989
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Signaturen vil bli markert som ikke-opphevbar.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:996
 msgid "I have not checked this key at all.\n"
 msgstr "Jeg har ikke sjekket denne n�kkelen i det hele tatt.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1001
 msgid "I have checked this key casually.\n"
 msgstr "Jeg har sjekket denne n�kkelen p� vanlig m�te.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1006
 msgid "I have checked this key very carefully.\n"
 msgstr "Jeg har sjekket denne n�kkelen veldig n�ye.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1016
 msgid "Really sign? (y/N) "
 msgstr "Virkelig signere? (j/N) "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
-#: g10/keyedit.c:5004 g10/sign.c:352
+#: g10/keyedit.c:1061 g10/keyedit.c:4793 g10/keyedit.c:4884 g10/keyedit.c:4948
+#: g10/keyedit.c:5009 g10/sign.c:351
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering mislyktes: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1126
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1137 g10/keygen.c:3215
 msgid "This key is not protected.\n"
 msgstr "Denne n�kkelen er ikke beskyttet.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Hemmelige deler av prim�rn�kkelen er ikke tilgjengelig.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1145 g10/keygen.c:3218
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Hemmelige deler av prim�rn�kkelen er lagret p� kort.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1149 g10/keygen.c:3222
 msgid "Key is protected.\n"
 msgstr "N�kkelen er beskyttet.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1173
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan ikke redigere denne n�kkelen: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1179
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr "Tast inn den nye passfrasen for denne hemmelige n�kklen.\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1188 g10/keygen.c:1895
 msgid "passphrase not correctly repeated; try again"
 msgstr "passfrasen ble ikke gjentatt korrekt; pr�v igjen"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1193
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr "Du �nsker ikke en passfrase - dette er sannsynligvis en *dum* id�!\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1196
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vil du virkelig gj�re dette? (j/N) "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1267
 msgid "moving a key signature to the correct place\n"
 msgstr "flytter en n�kkelsignatur til den rette plassen\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1353
 msgid "save and quit"
 msgstr "lagre og avslutte"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1356
 msgid "show key fingerprint"
 msgstr "vise n�kkelens fingeravtrykk"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1357
 msgid "list key and user IDs"
 msgstr "liste n�kler og brukerider"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1359
 msgid "select user ID N"
 msgstr "velger brukerid N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1360
 msgid "select subkey N"
 msgstr "velger brukerid N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1361
 msgid "check signatures"
 msgstr "sjekke signaturer"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1366
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs locally"
 msgstr "signerere utvalgte brukerider lokalt"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a trust signature"
 msgstr "signere utvalgte brukerider med en tillitssignatur"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1379
 msgid "add a user ID"
 msgstr "legge til en brukerid"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1381
 msgid "add a photo ID"
 msgstr "legge til en fotoid"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1383
 msgid "delete selected user IDs"
 msgstr "slette utvalgte brukerider"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1388
 msgid "add a subkey"
 msgstr "legge til en undern�kkel"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1392
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1394
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1396
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1400
 msgid "delete selected subkeys"
 msgstr "slette utvalgte undern�kler"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1402
 msgid "add a revocation key"
 msgstr "legge til en opphevingsn�kkel"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1404
 msgid "delete signatures from the selected user IDs"
 msgstr "slette signaturene fra de utvalgte brukeridene"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1406
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1408
 msgid "flag the selected user ID as primary"
 msgstr "markere den valgte brukeriden som den prim�re"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1410
 msgid "toggle between the secret and public key listings"
 msgstr "veksle mellom hemmelig og offentlig n�kkellisting"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1413
 msgid "list preferences (expert)"
 msgstr "liste preferanser (ekspert)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1415
 msgid "list preferences (verbose)"
 msgstr "liste preferanser (fyldig)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1417
 msgid "set preference list for the selected user IDs"
 msgstr "sette preferanseliste for de valgte brukeridene"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1422
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "sette URL for foretrukket n�kkelserver for de valgte brukeridene"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1424
 msgid "set a notation for the selected user IDs"
 msgstr "sette en notasjon for de valgte brukeridene"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "endre passfrasen"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "endre eiertilliten"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1432
 msgid "revoke signatures on the selected user IDs"
 msgstr "oppheve signaturene p� de valgte brukeridene"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1434
 msgid "revoke selected user IDs"
 msgstr "oppheve utvalgte brukerider"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1439
 msgid "revoke key or selected subkeys"
 msgstr "oppheve n�kkel eller utvalgte undern�kler"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1440
 msgid "enable key"
 msgstr "innkoble en n�kkel"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1441
 msgid "disable key"
 msgstr "utkoble en n�kkel"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1442
 msgid "show selected photo IDs"
 msgstr "vise utvalgte fotoider"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1446
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1564
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "feil ved lesing av hemmelig n�kkelblokk �%s�: %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1582
 msgid "Secret key is available.\n"
 msgstr "Hemmelig n�kkel er tilgjengelig\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1663
 msgid "Need the secret key to do this.\n"
 msgstr "Trenger den hemmelige n�kkelen for � gj�re dette.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1671
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Vennligst bruk kommandoen �toggle� f�rst.\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1690
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3082,569 +3086,569 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1730
 msgid "Key is revoked."
 msgstr "N�kkelen er opphevet."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1749
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Virkelig signerere alle brukerider? (j/N) "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1756
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: Velg brukeriden som skal signeres\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1765
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Ukjent signaturtype �%s�\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1788
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Denne kommandoen er ikke tillatt i %s-modus.\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
 msgid "You must select at least one user ID.\n"
 msgstr "Du m� velge minst en brukerid.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1812
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan ikke slette den siste brukeriden!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1814
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Virkelig fjerne alle valgte brukerider? (j/N) "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1815
 msgid "Really remove this user ID? (y/N) "
 msgstr "Virkelig fjerne denne brukeriden? (j/N) "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1865
 msgid "Really move the primary key? (y/N) "
 msgstr "Virkelig flytte prim�rn�kkelen? (j/N) "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1877
 msgid "You must select exactly one key.\n"
 msgstr "Du m� velge minst en n�kkel.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1905
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1919
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Kan ikke �pne �%s�: %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1936
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Feil ved lesing av sikkerhetskopiert n�kkel �%s�: %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1960
 msgid "You must select at least one key.\n"
 msgstr "Du m� velge minst en n�kkel.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1963
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vil du virkelig slette den valgte n�kkelen? (j/N) "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1964
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vil du virkelig slette denne n�kkelen? (j/N) "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:1999
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Virkelig oppheve alle de valgte brukeridene? (j/N) "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2000
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Virkelig oppheve denne brukeriden? (j/N) "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2018
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vil du virkelig oppheve hele n�kkelen? (j/N) "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2029
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vil du virkelig oppheve de valgte undern�klene? (j/N) "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2031
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vil du virkelig oppheve denne undern�kkelen? (j/N) "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2081
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2123
 msgid "Set preference list to:\n"
 msgstr "sette preferanseliste til:\n"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2129
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Virkelig oppdatere preferansene for de valgte brukeridene? (j/N) "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2131
 msgid "Really update the preferences? (y/N) "
 msgstr "Virkelig oppdatere preferansene? (j/N) "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2199
 msgid "Save changes? (y/N) "
 msgstr "Lagre endringene? (j/N) "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2202
 msgid "Quit without saving? (y/N) "
 msgstr "Avslutte uten � lagre? (j/N) "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2212
 #, c-format
 msgid "update failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "oppdatering av hemmelig mislyktes: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2226
 msgid "Key not changed so no update needed.\n"
 msgstr "N�kkelen ble ikke endret, s� ingen oppdatering er n�dvendig.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2327
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2379
 msgid "Features: "
 msgstr "S�rtrekk: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2390
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2405 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2413 g10/keyedit.c:2414
 msgid "Notations: "
 msgstr "Notasjoner: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2624
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Det er ingen preferanser for en PGP 2.x-aktig brukerid.\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2683
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Denne n�kkelen ble opphevet den %s av %s med n�kkelen %s\n"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2704
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Denne n�kkelen kan bli opphevet av %s med n�kkelen %s"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2710
 msgid "(sensitive)"
 msgstr "(sensitiv)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keyedit.c:2726 g10/keyedit.c:2782 g10/keyedit.c:2843 g10/keyedit.c:2858
 #: g10/keylist.c:194 g10/keyserver.c:511
 #, c-format
 msgid "created: %s"
 msgstr "opprettet: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2729 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
 #, c-format
 msgid "revoked: %s"
 msgstr "opphevet: %s"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2731 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "utgikk: %s"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2733 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
 #, c-format
 msgid "expires: %s"
 msgstr "utg�r: %s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2735
 #, c-format
 msgid "usage: %s"
 msgstr "bruksm�te: %s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2750
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2754
 #, c-format
 msgid "validity: %s"
 msgstr "gyldighet: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2761
 msgid "This key has been disabled"
 msgstr "Denne n�kkelen har blitt utkoblet"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2789 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2813
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "opphevet"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "utg�tt"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2944
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3005
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3351
+#: g10/keyedit.c:3010 g10/keyedit.c:3345
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Er du sikker p� at du vil legge den til? (j/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3016
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3156
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Slette denne gode signaturen? (j/N/a)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3166
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3170
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3176
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3190
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettet %d signatur.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3191
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Slettet %d signaturer.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3194
 msgid "Nothing deleted.\n"
 msgstr "Ingen ble slettet.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3227 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "ugyldig"
 
-#: g10/keyedit.c:3235
+#: g10/keyedit.c:3229
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "brukerid �%s�: allerede renset\n"
 
-#: g10/keyedit.c:3242
+#: g10/keyedit.c:3236
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3237
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "brukerid �%s�: allerede renset\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3246
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "brukerid �%s�: allerede renset\n"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3340
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3351
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3371
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3396
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3417
+#: g10/keyedit.c:3411
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3439
+#: g10/keyedit.c:3433
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3452
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3464
+#: g10/keyedit.c:3458
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Er du fortsatt sikker p� at du vil gj�re denne n�kkelen til en opphever? (j/"
 "N) "
 
-#: g10/keyedit.c:3525
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3531
+#: g10/keyedit.c:3526
 msgid "Please select at most one subkey.\n"
 msgstr "Vennligst velg minst en undern�kkel.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3530
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3538
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3582
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3598
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3678
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Undern�kkel %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:3679
+#: g10/keyedit.c:3684
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3841
+#: g10/keyedit.c:3846
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
+#: g10/keyedit.c:3885 g10/keyedit.c:3995 g10/keyedit.c:4115 g10/keyedit.c:4256
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hopper over v3 selvsignatur for brukerid �%s�\n"
 
-#: g10/keyedit.c:4051
+#: g10/keyedit.c:4056
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4131
+#: g10/keyedit.c:4136
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Er du sikker p� at du vil erstatte den? (j/N) "
 
-#: g10/keyedit.c:4132
+#: g10/keyedit.c:4137
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Er du sikker p� at du vil slette den? (j/N) "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4199
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4348
 msgid "Proceed? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4407
+#: g10/keyedit.c:4412
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4470
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4492
+#: g10/keyedit.c:4497
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4627
+#: g10/keyedit.c:4632
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4635 g10/keyedit.c:4699 g10/keyedit.c:4742
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 msgid " (non-exportable)"
 msgstr " (ikke-eksporterbar)"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4641
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne signaturen utgikk den %s.\n"
 
-#: g10/keyedit.c:4640
+#: g10/keyedit.c:4645
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4644
+#: g10/keyedit.c:4649
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4671
+#: g10/keyedit.c:4676
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4697
+#: g10/keyedit.c:4702
 msgid " (non-revocable)"
 msgstr " (ikke-opphevbar)"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4709
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4731
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4746
+#: g10/keyedit.c:4751
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4781
 msgid "no secret key\n"
 msgstr "ingen hemmelig n�kkel\n"
 
-#: g10/keyedit.c:4846
+#: g10/keyedit.c:4851
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "brukerid �%s� er allerede opphevet\n"
 
-#: g10/keyedit.c:4863
+#: g10/keyedit.c:4868
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ADVARSEL: en brukeridsignatur er datert %d sekunder i fremtiden\n"
 
-#: g10/keyedit.c:4927
+#: g10/keyedit.c:4932
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "N�kkelen %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:4989
+#: g10/keyedit.c:4994
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undern�kkel %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:5084
+#: g10/keyedit.c:5089
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "preferansen %s er duplisert\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 msgid "too many cipher preferences\n"
 msgstr "for mange cipher-preferanser\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 msgid "too many digest preferences\n"
 msgstr "for mange digest-preferanser\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 msgid "too many compression preferences\n"
 msgstr "for mange kompresjons-preferanser\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "ugyldig oppf�ring �%s� i preferansestreng\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:876
 msgid "writing direct signature\n"
 msgstr "skriver direkte signatur\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:915
 msgid "writing self signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:965
 msgid "writing key binding signature\n"
 msgstr "skriver n�kkelbindende signatur\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
+#: g10/keygen.c:2776
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "n�kkelst�rrelsen er ugyldig; bruker %u bits\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "n�kkelst�rrelsen ble rundet opp til %u bits\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1331
 msgid "Sign"
 msgstr "Signere"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1334
 msgid "Certify"
 msgstr "Bekrefte"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1337
 msgid "Encrypt"
 msgstr "Kryptere data"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1340
 msgid "Authenticate"
 msgstr "Autentisere"
 
@@ -3652,109 +3656,109 @@ msgstr "Autentisere"
 # K og k for kryptering
 # A og a for autentisering
 # Q og q for avslutte
-#: g10/keygen.c:1340
+#: g10/keygen.c:1348
 msgid "SsEeAaQq"
 msgstr "SsKkAaQq"
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1367
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1371
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1376
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1379
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1382
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1385
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1441
 msgid "Please select what kind of key you want:\n"
 msgstr "Vennligst velg hvilken type n�kkel du vil ha:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1443
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA og ElGamal (standard)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (bare signering)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1446
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (sette dine egne muligheter)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1448
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (bare kryptering)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (bare signering)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (bare kryptering)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1453
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (sette dine egne muligheter)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1522
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-n�kkelpar vil ha %u bits.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1532
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1539
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1553
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1559
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�nsket n�kkelst�rrelse er %u bits\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1564 g10/keygen.c:1569
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet opp til %u bits\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1618
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3770,7 +3774,7 @@ msgstr ""
 "      <n>m = n�kkelen utg�r om n months\n"
 "      <n>y = n�kkelen utg�r om n years\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1629
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3786,38 +3790,38 @@ msgstr ""
 "      <n>m = signaturen utg�r om n months\n"
 "      <n>y = signaturen utg�r om n years\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Key is valid for? (0) "
 msgstr "N�kkelen er gyldig for? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1655
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signaturen er gyldig for? (%s) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1673
 msgid "invalid value\n"
 msgstr "ugyldig verdi\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1680
 msgid "Key does not expire at all\n"
 msgstr "N�kkel utg�r ikke i det hele tatt\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Signature does not expire at all\n"
 msgstr "Signaturen utg�r ikke i det hele tatt\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1686
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "N�kkel utg�r den %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1687
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signaturen utg�r den %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1693
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3825,11 +3829,11 @@ msgstr ""
 "Systemet ditt kan ikke vise datoer etter 2038.\n"
 "Likevel vil det bli h�ndtert korrekt opp til 2106.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1698
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt (j/N)? "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1713
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3845,44 +3849,44 @@ msgstr ""
 "    �Heinrich Heine (Der Dichter) <[email protected]>�\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1726
 msgid "Real name: "
 msgstr "Fullt navn: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Invalid character in name\n"
 msgstr "Ugyldig tegn i navn\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name may not start with a digit\n"
 msgstr "Navnet kan ikke starte med et siffer\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1738
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navnet m� v�re minst 5 tegn langt\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1746
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1752
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1760
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1766
 msgid "Invalid character in comment\n"
 msgstr "Ugyldig tegn i kommentar\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1789
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruker tegnsettet �%s�.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1795
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3893,7 +3897,7 @@ msgstr ""
 "    �%s�\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1800
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Vennligst ikke putt epostadressen inn i fullt navn eller i kommentaren\n"
@@ -3909,23 +3913,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 msgid "NnCcEeOoQq"
 msgstr "NnKeEeRrAa"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1826
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (A)vslutt? "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (R)iktig/(A)vslutt? "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:1846
 msgid "Please correct the error first\n"
 msgstr "Vennligst korriger feilen f�rst\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1886
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3933,12 +3937,12 @@ msgstr ""
 "Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:1896 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1902
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -3950,7 +3954,7 @@ msgstr ""
 "hjelp av dette programmet og valget �--edit-key�.\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:1924
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3962,50 +3966,50 @@ msgstr ""
 "diskene jobbe) under primtallgenereringen; dette gir\n"
 "tilfeldig-tall-generatoren en bedre sjanse til � samle nok entropy.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2722
 msgid "Key generation canceled.\n"
 msgstr "N�kkelgenereringen ble avbrutt.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:2921 g10/keygen.c:3068
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentlig n�kkel til �%s�\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:2923 g10/keygen.c:3071
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver forel�pig hemmelig n�kkel til �%s�\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:2926 g10/keygen.c:3074
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmelig n�kkel til �%s�\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3057
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "ingen skrivbart offentlig n�kkelknippe ble funnet: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3063
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "ingen skrivbart hemmelig n�kkelknippe ble funnet: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3081
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "feil ved skriving av offentlig n�kkelknippe �%s�: %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3088
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "feil ved skriving av hemmelig n�kkelknippe �%s�: %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3111
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�kkel opprettet og signert.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3122
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4014,13 +4018,13 @@ msgstr ""
 "kanskje � bruke kommandoen �--edit-key� for � generere en\n"
 "sekund�rn�kkel for dette form�let.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "N�kkelgenerering mislyktes: %s\n"
 
 # Er dette entallsformen av denne strengen?
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4029,7 +4033,7 @@ msgstr ""
 "klokkeproblem)\n"
 
 # Er dette flertallsformen av denne og den forrige strengen?
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4037,27 +4041,27 @@ msgstr ""
 "n�kkel har blitt opprettet %lu sekunder i fremtiden (time warp eller "
 "klokkeproblem)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3197 g10/keygen.c:3326
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "MERK: opprettelse av undern�kler for v3-n�kler er ikke i samsvar med "
 "OpenPGP\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3236 g10/keygen.c:3359
 msgid "Really create? (y/N) "
 msgstr "Virkelig opprette? (j/N)"
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3524
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "lagring av n�kkel p� kort mislyktes: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3571
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3597
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
@@ -4334,207 +4338,211 @@ msgstr "ADVARSEL: klarte ikke � fange URI %s: %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ADVARSEL: klarte ikke � parse URI %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:239
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "merkelig st�rrelse for en kryptert sesjonsn�kkel (%d)\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr ""
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:300
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "passfrase er generert med en ukjent digest-algoritme %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:381
 #, c-format
 msgid "public key is %s\n"
 msgstr "offentlig n�kkel er %s\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:438
 msgid "public key encrypted data: good DEK\n"
 msgstr "offentlig n�kkel-kryptert data: god DEK\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:471
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "kryptert med %u-bit %s-n�kkel, ID %s, opprettet %s\n"
 
 # Do we really need to translate this string.
 # The must some bug in the code.
-#: g10/mainproc.c:476 g10/pkclist.c:219
+#: g10/mainproc.c:475 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      �%s�\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:479
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "kryptert med %s-n�kkel, ID %s\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:493
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "offentlig n�kkel-dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:507
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr ""
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:509
 msgid "encrypted with 1 passphrase\n"
 msgstr ""
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:540 g10/mainproc.c:562
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr ""
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:548
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:581
+#: g10/mainproc.c:580
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:584
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:597
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:603
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:624
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:626
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "opprinnelig filnavn=�%.*s�\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:711
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr ""
+
+#: g10/mainproc.c:839
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1187
 msgid "no signature found\n"
 msgstr "ingen signatur ble funnet\n"
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1430
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1539
 msgid "can't handle this ambiguous signature data\n"
 msgstr ""
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1550
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur opprettet %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1551
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               bruker %s n�kkel %s\n"
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1555
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatur laget %s ved hjelp av %s-n�kkel ID %s\n"
 
-#: g10/mainproc.c:1544
+#: g10/mainproc.c:1575
 msgid "Key available at: "
 msgstr "N�kkel tilgjengelig ved: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "D�RLIG signatur fra �%s�"
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utg�tt signatur fra �%s�"
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "God signatur fra �%s�"
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr "[usikker]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1797
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka �%s�"
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1895
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signatur utg�tt %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1900
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signatur utg�r %s\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1903
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur, digestalgoritme %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr "bin�r"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr "tekstmodus"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 msgid "unknown"
 msgstr "ukjent"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:2037
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2013
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -4667,16 +4675,16 @@ msgstr "ADVARSEL: valgene i �%s� er ikke aktive under denne kj�ringen\n"
 msgid "directory `%s' created\n"
 msgstr "katalogen �%s� ble opprettet\n"
 
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:143
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:713
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1159
+#: g10/parse-packet.c:1164
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -5396,12 +5404,12 @@ msgid ""
 "unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:347
+#: g10/sign.c:346
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr ""
 
-#: g10/sign.c:356
+#: g10/sign.c:355
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s-signatur fra: �%s�\n"
@@ -5422,11 +5430,11 @@ msgstr ""
 msgid "signing:"
 msgstr ""
 
-#: g10/sign.c:1100
+#: g10/sign.c:1101
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1278
+#: g10/sign.c:1280
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 6e0be3e76..e201ee604 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,102 +1,129 @@
-# Dutch translation of gnupg.
-# Copyright (C) 2004 Free Software Foundation, Inc.
+# English translations for gnupg package.
+# Copyright (C) 2006 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gnupg package.
-# Elros Cyriatan <[email protected]>, 2004.
-# 
-# 
+# Automatically generated, 2006.
+#
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.2.2\n"
+"Project-Id-Version: gnupg 1.4.6\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-11-03 17:37+0100\n"
-"PO-Revision-Date: 2004-05-10 19:23+0200\n"
-"Last-Translator: Elros Cyriatan <[email protected]>\n"
-"Language-Team: Dutch <[email protected]>\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
+"PO-Revision-Date: 2007-03-05 10:27+0100\n"
+"Last-Translator: Ivar Snaaijer\n"
+"Language-Team: none\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cipher/md.c:137
-#, c-format
-msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr "digest-algoritme `%s' is alleen-lezen in deze uitgave\n"
-
-#: cipher/primegen.c:120
+#: cipher/primegen.c:121
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
-msgstr ""
+msgstr "kan geen priemgetal genereren met pbits=%u qbits=%u\n"
 
-#: cipher/primegen.c:311
+#: cipher/primegen.c:312
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
-msgstr ""
+msgstr "kan geen priemgetal genereren van minder dan %d bits\n"
 
-#: cipher/random.c:163
+#: cipher/random.c:173
 msgid "no entropy gathering module detected\n"
-msgstr "geen entropie verzamelende module gevonden\n"
+msgstr "geen entropie module gevonden\n"
+
+#: cipher/random.c:403
+#, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "‘%s’ is in gebruik: %s\n"
+
+#: cipher/random.c:408
+#, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "wacht op vrijkomen van ‘%s’...\n"
 
-#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
-#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
-#: g10/tdbio.c:600
+#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
+#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
+#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
-msgstr "kan `%s' niet openen: %s\n"
+msgstr "kan ‘%s’ niet openen: %s\n"
 
-#: cipher/random.c:391
+#: cipher/random.c:458
 #, c-format
 msgid "can't stat `%s': %s\n"
-msgstr "kan `%s' niet vinden: %s\n"
+msgstr "status van ‘%s’ is niet vast te stellen: %s\n"
 
-#: cipher/random.c:396
+#: cipher/random.c:463
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
-msgstr "`%s' is geen gewoon bestand - genegeerd\n"
+msgstr "‘%s’ is geen normaal bestand en wordt genegeerd\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:468
 msgid "note: random_seed file is empty\n"
-msgstr "let op: random_seed bestand is leeg\n"
+msgstr "noot: ’random_seed’ bestand is leeg\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:474
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
-"WAARSCHUWING: ongeldige grootte van random_seed bestand - niet gebruikt\n"
+"Waarschuwing: bestandsgrote van ’random_seed’ bestand klopt niet en wordt "
+"genegeerd\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:482
 #, c-format
 msgid "can't read `%s': %s\n"
-msgstr "kan `%s' niet lezen: %s\n"
+msgstr "kan ‘%s’ niet lezen: %s\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:520
 msgid "note: random_seed file not updated\n"
-msgstr "let op: random_seed bestand niet bijgewerkt\n"
+msgstr "noot: ’random_seed’ bestand wordt niet aangepast\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
-#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
-#: g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
+#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
+#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
-msgstr "kan `%s' niet aanmaken: %s\n"
+msgstr "kan ‘%s’ niet aanmaken: %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:556 cipher/random.c:566
 #, c-format
 msgid "can't write `%s': %s\n"
-msgstr "kan `%s' niet schrijven: %s\n"
+msgstr "kan ‘%s’ niet schrijven: %s\n"
 
-#: cipher/random.c:483
+#: cipher/random.c:569
 #, c-format
 msgid "can't close `%s': %s\n"
-msgstr "kan `%s' niet sluiten: %s\n"
+msgstr "kan ‘%s’ niet sluiten: %s\n"
 
-#: cipher/random.c:728
+#: cipher/random.c:814
 msgid "WARNING: using insecure random number generator!!\n"
-msgstr ""
-"WAARSCHUWING: er wordt een onveilige willekeurige getallen generator "
-"gebruikt!!\n"
+msgstr "Waarschuwing: er wordt een onveilige nummer generator gebruikt!!\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:815
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -104,23 +131,23 @@ msgid ""
 "DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n"
 "\n"
 msgstr ""
-"De willekeurige getallen generator is slechts profisorisch bedoeld om het\n"
-"programma te laten werken - hij is zeker niet goed!\n"
+"De willekeurig nummer generator is allen maar een hulpmiddel om\n"
+"er voor te zorgen dat het werkt, het is geen echt willekeurig nummer!\n"
 "\n"
-"GEBRUIK GEEN GEGEVENS DIE GEGENEREERD ZIJN DOOR DIT PROGRAMMA!!\n"
+"GEBRUIK DE GEGENEREERDE GEGEVENS NIET!!\n"
 "\n"
 
-#: cipher/rndegd.c:204
+#: cipher/rndegd.c:202
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
 "of the entropy.\n"
 msgstr ""
-"Even geduld alstublieft, er wordt entropie verzameld. Doe wat werk\n"
-"als u dan niet verveeld raakt, want het verbeterd de kwaliteit van de\n"
-"entropie.\n"
+"Ogenblik geduld, entropie wordt verzameld. Ga wat anders doen op deze\n"
+"computer. Deze stap duurt even en U verbeterd de kwalitreit van\n"
+"de entropie.\n"
 
-#: cipher/rndlinux.c:134
+#: cipher/rndlinux.c:132
 #, c-format
 msgid ""
 "\n"
@@ -128,934 +155,1002 @@ msgid ""
 "the OS a chance to collect more entropy! (Need %d more bytes)\n"
 msgstr ""
 "\n"
-"Onvoldoende willekeurige bytes beschikbaar.  Doe alstublieft wat ander werk\n"
-"om het besturingssysteem de kans te geven om meer entropie te verzamelen!\n"
-"(Er zijn nog %d bytes nodig)\n"
+"Er zijn nog niet genoeg willekeurge gegevens. Ga alstublieft een ander\n"
+"programma gebruiken om het OS de kans te geven nog %d bytes te verzamelen\n"
 
-#: g10/app-openpgp.c:534
-#, fuzzy, c-format
+#: g10/app-openpgp.c:596
+#, c-format
 msgid "failed to store the fingerprint: %s\n"
-msgstr "initialiseren van vertrouwensgegevensbank mislukt: %s\n"
+msgstr "Het was niet mogelijk de vingerafdruk op te slaan: %s\n"
 
-#: g10/app-openpgp.c:547
-#, fuzzy, c-format
+#: g10/app-openpgp.c:609
+#, c-format
 msgid "failed to store the creation date: %s\n"
-msgstr "opnieuw opbouwen sleutelbos buffer mislukt: %s\n"
+msgstr "Het was niet mogelijk de aanmaakdatum op te slaan: %s\n"
+
+#: g10/app-openpgp.c:977
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "het lezen van de publieke sleutel is mislukt: %s\n"
+
+#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+msgid "response does not contain the public key data\n"
+msgstr "de teruggekregen informatie bevat geen publieke sleutel gegevens\n"
+
+#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+msgid "response does not contain the RSA modulus\n"
+msgstr "de teruggekregen informatie bevat geen RSA modulus\n"
+
+#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+msgid "response does not contain the RSA public exponent\n"
+msgstr "de teruggekregen informatie bevatten geen RSA publiek exponent\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
-msgstr ""
+msgstr "PIN reactie gaf een fout: %s\n"
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr ""
+msgstr "PIN voor CHV%d is te kort; deze moet minimaal %d lang zijn\n"
 
-#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
-#, fuzzy, c-format
+#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#, c-format
 msgid "verify CHV%d failed: %s\n"
-msgstr "Sleutelaanmaak mislukt: %s\n"
+msgstr "controle CHV%d heeft gefaalt: %s\n"
 
-#: g10/app-openpgp.c:784
+#: g10/app-openpgp.c:1310
 msgid "access to admin commands is not configured\n"
-msgstr ""
+msgstr "toegang tot beheerders commando's is niet geconfigureerd\n"
 
-#: g10/app-openpgp.c:801
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
-msgstr ""
+msgstr "Ophalen van de CHV status geeft een fout\n"
 
-#: g10/app-openpgp.c:807
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
-msgstr ""
+msgstr "kaart is permanent geblokkeerd!\n"
 
-#: g10/app-openpgp.c:814
+#: g10/app-openpgp.c:1336
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
+"%d beheerder PIN pogingen resteren voordat de kaart permanent geblokkeerd "
+"wordt\n"
 
-#: g10/app-openpgp.c:818
-msgid "Admin PIN"
-msgstr ""
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:1343
+msgid "|A|Admin PIN"
+msgstr "|A|Beheerders PIN"
+
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:1492
+msgid "|AN|New Admin PIN"
+msgstr "|AN|Nieuwe beheerders PIN"
+
+#: g10/app-openpgp.c:1492
+msgid "|N|New PIN"
+msgstr "|N|Nieuwe PIN"
 
-#: g10/app-openpgp.c:1301
+#: g10/app-openpgp.c:1496
 #, c-format
-msgid "PIN [sigs done: %lu]"
-msgstr ""
+msgid "error getting new PIN: %s\n"
+msgstr "fout met nieuwe PIN: %s\n"
 
-#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
-#, fuzzy, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "geen geldige OpenPGP-gegevens gevonden.\n"
+#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+msgid "error reading application data\n"
+msgstr "fout bij het lezen van programma gegevens\n"
+
+#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+msgid "error reading fingerprint DO\n"
+msgstr "fout bij het lezen van de vingerafdruk DO\n"
+
+#: g10/app-openpgp.c:1562
+msgid "key already exists\n"
+msgstr "de sleutel bestaat reeds\n"
+
+#: g10/app-openpgp.c:1566
+msgid "existing key will be replaced\n"
+msgstr "de bestaande sleutel zal worden vervangen\n"
+
+#: g10/app-openpgp.c:1568
+msgid "generating new key\n"
+msgstr "aanmaken nieuwe sleutel\n"
+
+#: g10/app-openpgp.c:1735
+msgid "creation timestamp missing\n"
+msgstr "aanmaaktijd informatie mist\n"
+
+#: g10/app-openpgp.c:1742
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr "RSA modulus is niet aanwezig of heeft niet %d bits\n"
 
-#: g10/app-openpgp.c:1668
-#, fuzzy, c-format
-msgid "error getting serial number: %s\n"
-msgstr "fout bij maken wachtwoord: %s\n"
+#: g10/app-openpgp.c:1749
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr "RSA publieke exponent is niet aanwezig of is groter dan %d bits\n"
+
+#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr "RSA priemgetal %s is niet aanwezig of heeft niet %d bits\n"
 
-#: g10/app-openpgp.c:1763
-#, fuzzy, c-format
+#: g10/app-openpgp.c:1827
+#, c-format
 msgid "failed to store the key: %s\n"
-msgstr "initialiseren van vertrouwensgegevensbank mislukt: %s\n"
+msgstr "het is mislukt om de sleutel op te slaan: %s\n"
 
-#: g10/app-openpgp.c:1805
-#, fuzzy
-msgid "reading the key failed\n"
-msgstr "verwijderen sleutelblok mislukt: %s\n"
+#: g10/app-openpgp.c:1886
+msgid "please wait while key is being generated ...\n"
+msgstr "wacht terwijl de sleutel wordt aangemaakt ...\n"
 
-#: g10/app-openpgp.c:1812
-msgid "response does not contain the public key data\n"
-msgstr ""
+#: g10/app-openpgp.c:1901
+msgid "generating key failed\n"
+msgstr "aanmaken van de sleutel is mislukt\n"
 
-#: g10/app-openpgp.c:1820
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
+#: g10/app-openpgp.c:1904
+#, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "het aanmaken van de sleutel is voltooid (in %d seconden)\n"
 
-#: g10/app-openpgp.c:1831
-msgid "response does not contain the RSA public exponent\n"
+#: g10/app-openpgp.c:1961
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "verkeerde structuur van de OpenPGP kaart (DO 0x93)\n"
+
+#: g10/app-openpgp.c:2087
+#, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "de kaart ondersteund het samenvattings algortime %s niet\n"
+
+#: g10/app-openpgp.c:2134
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "momenteel gegenereerde ondertekeningen: %lu\n"
+
+#: g10/app-openpgp.c:2142
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||Geef uw PIN%%0A[%lu ondertekeningen gemaakt]"
+
+#: g10/app-openpgp.c:2403
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
+"controleren van de beheerders PIN is momenteel niet toegestaan met dit "
+"commando\n"
 
-#: g10/armor.c:317
+#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "kan %s niet benaderen - ongeldige OpenPGP kaart?\n"
+
+#: g10/armor.c:372
 #, c-format
 msgid "armor: %s\n"
-msgstr "bepantsering: %s\n"
+msgstr "versleuteling: %s\n"
 
-#: g10/armor.c:346
+#: g10/armor.c:411
 msgid "invalid armor header: "
-msgstr "ongeldige bepantseringskop: "
+msgstr "ongeldige versleutelings kop: "
 
-#: g10/armor.c:353
+#: g10/armor.c:422
 msgid "armor header: "
-msgstr "bepantseringskop: "
+msgstr "versleutelings kop: "
 
-#: g10/armor.c:364
+#: g10/armor.c:433
 msgid "invalid clearsig header\n"
-msgstr "ongeldige kop niet-gecodeerde ondertekening\n"
+msgstr "ongeldige ’clearsig’ header\n"
 
-#: g10/armor.c:416
+#: g10/armor.c:485
 msgid "nested clear text signatures\n"
-msgstr "geneste niet-gecodeerde ondertekeningen\n"
+msgstr "ingesloten platte tekst ondertekeningen\n"
 
-#: g10/armor.c:551
-#, fuzzy
+#: g10/armor.c:620
 msgid "unexpected armor: "
-msgstr "onverwachte bepantsering:"
+msgstr "onverwachte versleuteling: "
 
-#: g10/armor.c:563
+#: g10/armor.c:632
 msgid "invalid dash escaped line: "
-msgstr ""
+msgstr "ongeldige streep code lijn: "
 
-#: g10/armor.c:715 g10/armor.c:1300
-#, fuzzy, c-format
+#: g10/armor.c:786 g10/armor.c:1396
+#, c-format
 msgid "invalid radix64 character %02X skipped\n"
-msgstr "ongeldig grondtal64-teken %02x overgeslagen\n"
+msgstr "ongeldig radix64 karakter %02X overgeslagen\n"
 
-#: g10/armor.c:758
+#: g10/armor.c:829
 msgid "premature eof (no CRC)\n"
-msgstr "vroegtijdig einde bestand (geen CRC)\n"
+msgstr "onverwacht bestandseinde (geen CRC)\n"
 
-#: g10/armor.c:792
+#: g10/armor.c:863
 msgid "premature eof (in CRC)\n"
-msgstr "vroegtijdig einde bestand (in CRC)\n"
+msgstr "onverwacht bestandseinde (tijdens het lezen van de CRC)\n"
 
-#: g10/armor.c:800
+#: g10/armor.c:871
 msgid "malformed CRC\n"
-msgstr "misvormde CRC\n"
+msgstr "ongeldige CRC\n"
 
-#: g10/armor.c:804 g10/armor.c:1337
-#, fuzzy, c-format
+#: g10/armor.c:875 g10/armor.c:1433
+#, c-format
 msgid "CRC error; %06lX - %06lX\n"
-msgstr "CRC-fout; %06lx - %06lx\n"
+msgstr "CRC fout; %06lX - %06lX\n"
 
-#: g10/armor.c:824
-#, fuzzy
+#: g10/armor.c:895
 msgid "premature eof (in trailer)\n"
-msgstr "vroegtijdig einde bestand (in afsluitend deel)\n"
+msgstr "onverwacht bestandseinde (in de voet tekst)\n"
 
-#: g10/armor.c:828
+#: g10/armor.c:899
 msgid "error in trailer line\n"
-msgstr "fout in afsluitende regel\n"
+msgstr "fout in voet regel\n"
 
-#: g10/armor.c:1115
+#: g10/armor.c:1210
 msgid "no valid OpenPGP data found.\n"
-msgstr "geen geldige OpenPGP-gegevens gevonden.\n"
+msgstr "geen geldige OpenPGP gegevens gevonden.\n"
 
-#: g10/armor.c:1120
+#: g10/armor.c:1215
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
-msgstr "ongeldige bepantsering: regel langer dan %d tekens\n"
+msgstr "ongeldig versleuteling: de regel is langer dan %d tekens\n"
 
-#: g10/armor.c:1124
+#: g10/armor.c:1219
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
+"’quoted printable’ teken gevonden in versleutelings gegevens - \n"
+"mogelijk heeft de verzender een slecht gemaakt email programma gebruikt\n"
 
-#: g10/card-util.c:58 g10/card-util.c:282
-#, fuzzy, c-format
+#: g10/card-util.c:63 g10/card-util.c:306
+#, c-format
 msgid "OpenPGP card not available: %s\n"
-msgstr "geheime sleutel niet beschikbaar"
+msgstr "OpenPGP kaart is niet beschikbaar: %s\n"
 
-#: g10/card-util.c:63
+#: g10/card-util.c:68
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
-msgstr ""
+msgstr "OpenPGP kaart nummer %s gevonden\n"
 
-#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
-#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
-#, fuzzy
+#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
+#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
-msgstr "dat kan niet in batch-modus\n"
+msgstr "dit is niet mogelijk in automatische modus\n"
 
-#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1361
+#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
+#: g10/keygen.c:1456
 msgid "Your selection? "
 msgstr "Uw keuze? "
 
-#: g10/card-util.c:194 g10/card-util.c:244
+#: g10/card-util.c:216 g10/card-util.c:266
 msgid "[not set]"
-msgstr ""
+msgstr "[niet ingesteld]"
 
-#: g10/card-util.c:376
-#, fuzzy
+#: g10/card-util.c:413
 msgid "male"
-msgstr "enable"
+msgstr "man"
 
-#: g10/card-util.c:377
-#, fuzzy
+#: g10/card-util.c:414
 msgid "female"
-msgstr "enable"
+msgstr "vrouw"
 
-#: g10/card-util.c:377
-#, fuzzy
+#: g10/card-util.c:414
 msgid "unspecified"
-msgstr "Geen reden opgegeven"
+msgstr "niet gespecifiseerd"
 
-#: g10/card-util.c:396
-#, fuzzy
+#: g10/card-util.c:441
 msgid "not forced"
-msgstr "niet verwerkt"
+msgstr "niet geforceerd"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:441
 msgid "forced"
-msgstr ""
+msgstr "geforceerd"
 
-#: g10/card-util.c:439
+#: g10/card-util.c:519
 msgid "Error: Only plain ASCII is currently allowed.\n"
-msgstr ""
+msgstr "Fout: Alleen platte ASCII is hier toegestaan.\n"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:521
 msgid "Error: The \"<\" character may not be used.\n"
-msgstr ""
+msgstr "Fout: U mag het “<” teken hier niet gebruiken.\n"
 
-#: g10/card-util.c:443
+#: g10/card-util.c:523
 msgid "Error: Double spaces are not allowed.\n"
-msgstr ""
+msgstr "Fout: U mag geen dubbele spatie gebruiken.\n"
 
-#: g10/card-util.c:460
+#: g10/card-util.c:540
 msgid "Cardholder's surname: "
-msgstr ""
+msgstr "Achternaam van de kaarthouder: "
 
-#: g10/card-util.c:462
+#: g10/card-util.c:542
 msgid "Cardholder's given name: "
-msgstr ""
+msgstr "Voornaam van de kaarthouder: "
 
-#: g10/card-util.c:480
+#: g10/card-util.c:560
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
-msgstr ""
+msgstr "Fout: Gecombineerde naam is te lang (de limiet is %d tekens).\n"
 
-#: g10/card-util.c:502
-#, fuzzy
+#: g10/card-util.c:581
 msgid "URL to retrieve public key: "
-msgstr "geen geassocieerde openbare sleutel: %s\n"
+msgstr "URL om de publieke sleutel op te halen: "
 
-#: g10/card-util.c:510
+#: g10/card-util.c:589
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
-msgstr ""
+msgstr "Fout: URL is te lang (de limiet is %d tekens).\n"
 
-#: g10/card-util.c:603 g10/import.c:261
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
 #, c-format
 msgid "error reading `%s': %s\n"
-msgstr "fout bij lezen `%s': %s\n"
+msgstr "fout tijdens het lezen van ‘%s’: %s\n"
 
-#: g10/card-util.c:611
+#: g10/card-util.c:695
 msgid "Login data (account name): "
-msgstr ""
+msgstr "Aanlog gegevens (Login naam): "
 
-#: g10/card-util.c:621
+#: g10/card-util.c:705
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
-msgstr ""
+msgstr "Fout: Aanlog gegevens zijn te lang (de limiet is %d tekens).\n"
 
-#: g10/card-util.c:641
-#, fuzzy
+#: g10/card-util.c:764
+msgid "Private DO data: "
+msgstr "Geheime DO-gegevens: "
+
+#: g10/card-util.c:774
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr "Fout: Geheime DO is te lang (de limiet is %d tekens).\n"
+
+#: g10/card-util.c:794
 msgid "Language preferences: "
-msgstr "voorkeuren bijgewerkt"
+msgstr "Taal voorkeur: "
 
-#: g10/card-util.c:649
-#, fuzzy
+#: g10/card-util.c:802
 msgid "Error: invalid length of preference string.\n"
-msgstr "ongeldig teken in voorkeurtekenreeks\n"
+msgstr "Fout: verkeerde lengte van de voorkeursgegevens.\n"
 
-#: g10/card-util.c:658
-#, fuzzy
+#: g10/card-util.c:811
 msgid "Error: invalid characters in preference string.\n"
-msgstr "ongeldig teken in voorkeurtekenreeks\n"
+msgstr "Fout: ongeldige tekens in voorkeursgegevens.\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:832
 msgid "Sex ((M)ale, (F)emale or space): "
-msgstr ""
+msgstr "Geslacht ((M)Man, (F)Vrouw of spatie): "
 
-#: g10/card-util.c:693
-#, fuzzy
+#: g10/card-util.c:846
 msgid "Error: invalid response.\n"
-msgstr "fout: ongeldige vingerafdruk\n"
+msgstr "Fout: Ongeldige invoer.\n"
 
-#: g10/card-util.c:714
-#, fuzzy
+#: g10/card-util.c:867
 msgid "CA fingerprint: "
-msgstr "vingerafdruk weergeven"
+msgstr "CA vingerafdruk: "
 
-#: g10/card-util.c:737
-#, fuzzy
+#: g10/card-util.c:890
 msgid "Error: invalid formatted fingerprint.\n"
-msgstr "fout: ongeldige vingerafdruk\n"
+msgstr "Fout: ongeldig vormgegeven vingerafdruk.\n"
 
-#: g10/card-util.c:785
-#, fuzzy, c-format
+#: g10/card-util.c:938
+#, c-format
 msgid "key operation not possible: %s\n"
-msgstr "Sleutelaanmaak mislukt: %s\n"
+msgstr "sleutel actie is niet mogelijk: %s\n"
 
-#: g10/card-util.c:786
-#, fuzzy
+#: g10/card-util.c:939
 msgid "not an OpenPGP card"
-msgstr "geen geldige OpenPGP-gegevens gevonden.\n"
+msgstr "geen OpenPGP kaart"
 
-#: g10/card-util.c:795
-#, fuzzy, c-format
+#: g10/card-util.c:948
+#, c-format
 msgid "error getting current key info: %s\n"
-msgstr "fout bij schrijven geheime sleutelbos `%s': %s\n"
+msgstr "fout bij het ophalen van sleutel gegevens: %s\n"
 
-#: g10/card-util.c:878
+#: g10/card-util.c:1033
+#, fuzzy
 msgid "Replace existing key? (y/N) "
-msgstr ""
+msgstr "Vervangen bestaande sleutel? (j/N) "
 
-#: g10/card-util.c:899 g10/card-util.c:908
+#: g10/card-util.c:1054 g10/card-util.c:1063
+#, fuzzy
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
+"Moet er een externe reservekopie van de versleutel gegevens gemaakt worden? "
+"(J/n) "
 
-#: g10/card-util.c:920
+#: g10/card-util.c:1075
+#, fuzzy
 msgid "Replace existing keys? (y/N) "
-msgstr ""
+msgstr "Vervangen bestaande sleutels? (j/N) "
 
-#: g10/card-util.c:929
+#: g10/card-util.c:1084
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "You should change them using the command --change-pin\n"
 msgstr ""
+"De fabrieksinstellingen voor de codes zijn\n"
+"   PIN = ‘%s’     Beherder PIN = ‘%s’\n"
+"U wordt aangeraden deze te wijzigen met het commando --change-pin\n"
 
-#: g10/card-util.c:968
-#, fuzzy
+#: g10/card-util.c:1123
 msgid "Please select the type of key to generate:\n"
-msgstr "Kies alstublieft wat voor sleutel u wilt hebben:\n"
+msgstr "Selecteer het sleutel type:\n"
 
-#: g10/card-util.c:970 g10/card-util.c:1050
-#, fuzzy
+#: g10/card-util.c:1125 g10/card-util.c:1206
 msgid "   (1) Signature key\n"
-msgstr "Ondertekening verlopen %s\n"
+msgstr "   (1) Handtekening sleutel\n"
 
-#: g10/card-util.c:971 g10/card-util.c:1052
-#, fuzzy
+#: g10/card-util.c:1126 g10/card-util.c:1208
 msgid "   (2) Encryption key\n"
-msgstr "   (%d) RSA (alleen coderen)\n"
+msgstr "   (2) Codeer sleutel\n"
 
-#: g10/card-util.c:972 g10/card-util.c:1054
+#: g10/card-util.c:1127 g10/card-util.c:1210
 msgid "   (3) Authentication key\n"
-msgstr ""
+msgstr "   (3) Authorisatie sleutel\n"
 
-#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:642
+#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
+#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
 msgid "Invalid selection.\n"
-msgstr "Ongeldige keuze.\n"
+msgstr "Ongeldige selectie.\n"
 
-#: g10/card-util.c:1047
-#, fuzzy
+#: g10/card-util.c:1203
 msgid "Please select where to store the key:\n"
-msgstr "Kies alstublieft een reden voor de herroeping:\n"
+msgstr "Selcteer waar de sleutel moet worden opgeslagen:\n"
 
-#: g10/card-util.c:1082
-#, fuzzy
+#: g10/card-util.c:1238
 msgid "unknown key protection algorithm\n"
-msgstr "onbekend beschermingsalgoritme\n"
+msgstr "onbekend beveiligings algoritme\n"
 
-#: g10/card-util.c:1087
-#, fuzzy
+#: g10/card-util.c:1243
 msgid "secret parts of key are not available\n"
-msgstr "Geheime delen van primaire sleutel zijn niet beschikbaar.\n"
+msgstr "geheime delen van de sleutel zijn niet beschikbaar\n"
 
-#: g10/card-util.c:1092
-#, fuzzy
+#: g10/card-util.c:1248
 msgid "secret key already stored on a card\n"
-msgstr "overgeslagen: geheime sleutel reeds aanwezig\n"
-
-#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
-msgid "quit"
-msgstr "afsluiten"
+msgstr "geheime sleutel staat reeds op de kaart\n"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245
+#: g10/card-util.c:1319 g10/keyedit.c:1351
 msgid "quit this menu"
-msgstr "dit menu verlaten"
+msgstr "afsluiten van dit menu"
 
-#: g10/card-util.c:1163 g10/keyedit.c:1246
-msgid "q"
-msgstr "q"
-
-#: g10/card-util.c:1164
-msgid "admin"
-msgstr ""
-
-#: g10/card-util.c:1164
-#, fuzzy
+#: g10/card-util.c:1321
 msgid "show admin commands"
-msgstr "conflicterende opdrachten\n"
+msgstr "tonen beheerder commando's"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
-msgid "help"
-msgstr "help"
-
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1322 g10/keyedit.c:1354
 msgid "show this help"
-msgstr "deze hulp weergeven"
-
-#: g10/card-util.c:1167 g10/keyedit.c:1251
-msgid "list"
-msgstr "list"
+msgstr "toon deze hulp"
 
-#: g10/card-util.c:1167
-#, fuzzy
+#: g10/card-util.c:1324
 msgid "list all available data"
-msgstr "Geen hulp beschikbaar"
-
-#: g10/card-util.c:1168 g10/keyedit.c:1252
-msgid "l"
-msgstr "l"
+msgstr "toon alle beschikbare gegevens"
 
-#: g10/card-util.c:1169 g10/keyedit.c:1263
-msgid "debug"
-msgstr "debug"
-
-#: g10/card-util.c:1170
-#, fuzzy
-msgid "name"
-msgstr "enable"
-
-#: g10/card-util.c:1170
+#: g10/card-util.c:1327
 msgid "change card holder's name"
-msgstr ""
+msgstr "verander de naam van de kaarthouder"
 
-#: g10/card-util.c:1171
-msgid "url"
-msgstr ""
-
-#: g10/card-util.c:1171
+#: g10/card-util.c:1328
 msgid "change URL to retrieve key"
-msgstr ""
-
-#: g10/card-util.c:1172
-msgid "fetch"
-msgstr ""
+msgstr "verander de URL van de sleutel"
 
-#: g10/card-util.c:1173
+#: g10/card-util.c:1329
 msgid "fetch the key specified in the card URL"
-msgstr ""
-
-#: g10/card-util.c:1174
-#, fuzzy
-msgid "login"
-msgstr "lsign"
+msgstr "download de sleutel van de kaart URL"
 
-#: g10/card-util.c:1174
-#, fuzzy
+#: g10/card-util.c:1330
 msgid "change the login name"
-msgstr "de verloopdatum wijzigen"
+msgstr "verander de aanlog naam"
 
-#: g10/card-util.c:1175
-msgid "lang"
-msgstr ""
-
-#: g10/card-util.c:1175
-#, fuzzy
+#: g10/card-util.c:1331
 msgid "change the language preferences"
-msgstr "het eigenaarsvertrouwen wijzigen"
-
-#: g10/card-util.c:1176
-msgid "sex"
-msgstr ""
+msgstr "verander de taal voorkeur"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1332
 msgid "change card holder's sex"
-msgstr ""
-
-#: g10/card-util.c:1177
-#, fuzzy
-msgid "cafpr"
-msgstr "fpr"
+msgstr "verander de sexe van de kaarthouder"
 
-#: g10/card-util.c:1177
-#, fuzzy
+#: g10/card-util.c:1333
 msgid "change a CA fingerprint"
-msgstr "vingerafdruk weergeven"
+msgstr "verander een CA vingerafdruk"
 
-#: g10/card-util.c:1178
-#, fuzzy
-msgid "forcesig"
-msgstr "revsig"
-
-#: g10/card-util.c:1179
+#: g10/card-util.c:1334
 msgid "toggle the signature force PIN flag"
-msgstr ""
-
-#: g10/card-util.c:1180
-#, fuzzy
-msgid "generate"
-msgstr "algemene fout"
+msgstr "wissel de ondertekening forceer PIN vlag"
 
-#: g10/card-util.c:1181
-#, fuzzy
+#: g10/card-util.c:1335
 msgid "generate new keys"
-msgstr "een nieuw sleutelpaar genereren"
-
-#: g10/card-util.c:1182 g10/keyedit.c:1287
-msgid "passwd"
-msgstr "passwd"
+msgstr "genereer nieuwe sleutels"
 
-#: g10/card-util.c:1182
+#: g10/card-util.c:1336
 msgid "menu to change or unblock the PIN"
-msgstr ""
+msgstr "keuzelijst voor het deblokkeren of veranderen van de PIN"
 
-#: g10/card-util.c:1246 g10/keyedit.c:1397
+#: g10/card-util.c:1337
+msgid "verify the PIN and list all data"
+msgstr "controleer de PIN en toon alle gegevens"
+
+#: g10/card-util.c:1457 g10/keyedit.c:1617
 msgid "Command> "
-msgstr "Opdracht> "
+msgstr "Commando> "
 
-#: g10/card-util.c:1281
-#, fuzzy
+#: g10/card-util.c:1495
 msgid "Admin-only command\n"
-msgstr "conflicterende opdrachten\n"
+msgstr "Beheerder commando\n"
 
-#: g10/card-util.c:1297
-#, fuzzy
+#: g10/card-util.c:1526
 msgid "Admin commands are allowed\n"
-msgstr "conflicterende opdrachten\n"
+msgstr "Beheerder commando's zijn toegestaan\n"
 
-#: g10/card-util.c:1299
-#, fuzzy
+#: g10/card-util.c:1528
 msgid "Admin commands are not allowed\n"
-msgstr "bezig met schrijven geheime sleutel naar `%s'\n"
+msgstr "Beheerder commando's zijn niet toegestaan\n"
 
-#: g10/card-util.c:1360 g10/keyedit.c:1864
+#: g10/card-util.c:1602 g10/keyedit.c:2238
 msgid "Invalid command  (try \"help\")\n"
-msgstr "Ongeldige opdracht (probeer \"hulp\")\n"
+msgstr "Ongeldig commando  (probeer “help”)\n"
+
+#: g10/cardglue.c:416
+msgid "card reader not available\n"
+msgstr "kaartlezer is niet beschikbaar\n"
 
-#: g10/cardglue.c:280
+#: g10/cardglue.c:434
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr ""
+msgstr "Plaats de kaart en druk op return (of ‘c‘ om te stoppen): "
 
-#: g10/cardglue.c:364
+#: g10/cardglue.c:446
+#, c-format
+msgid "selecting openpgp failed: %s\n"
+msgstr "Selecteren van OpenPGP is mislukt: %s\n"
+
+#: g10/cardglue.c:573
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
+"Verwijder de huidige kaart en plaats de kaart terug met serienummer :\n"
+"   %.*s\n"
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:582
 msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr ""
+msgstr "Druk op return of ‘c‘ om te stoppen: "
+
+#: g10/cardglue.c:917
+msgid "Enter New Admin PIN: "
+msgstr "Geeft nieuwe beheerders PIN: "
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:918
+msgid "Enter New PIN: "
+msgstr "Geef nieuwe PIN: "
+
+#: g10/cardglue.c:919
 msgid "Enter Admin PIN: "
-msgstr ""
+msgstr "Geef beheerders PIN: "
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:920
 msgid "Enter PIN: "
-msgstr ""
+msgstr "Geef PIN: "
+
+#: g10/cardglue.c:937
+msgid "Repeat this PIN: "
+msgstr "Herhaal de PIN: "
+
+#: g10/cardglue.c:952
+msgid "PIN not correctly repeated; try again"
+msgstr "de tweede PIN is niet gelijk, probeer opnieuw"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
-#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
+#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
-msgstr "kan `%s' niet openen\n"
+msgstr "kan ‘%s’ niet openen\n"
 
-#: g10/decrypt.c:104 g10/encode.c:859
+#: g10/decrypt.c:105 g10/encode.c:839
 msgid "--output doesn't work for this command\n"
-msgstr "--uitvoer werkt niet voor deze opdracht\n"
+msgstr "--output werkt niet voor dit commando\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2927 g10/keyserver.c:1414
-#: g10/revoke.c:226
-#, fuzzy, c-format
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3386 g10/keyserver.c:1705
+#: g10/revoke.c:228
+#, c-format
 msgid "key \"%s\" not found: %s\n"
-msgstr "sleutel `%s' niet gevonden: %s\n"
+msgstr "sleutel ‘%s‘ niet gevonden: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
+#: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
-msgstr "fout bij lezen sleutelblok: %s\n"
+msgstr "fout tijdens het lezen van sleutelblok: %s\n"
 
-#: g10/delkey.c:121 g10/delkey.c:128
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
-msgstr "(tenzij u de sleutel aangeeft met de vingerafdruk)\n"
+msgstr "(tenzij U de vingerafdruk opgeeft)\n"
 
-#: g10/delkey.c:127
-#, fuzzy
+#: g10/delkey.c:135
 msgid "can't do this in batch mode without \"--yes\"\n"
-msgstr "dat kan niet in batch-modus zonder \"--yes\"\n"
+msgstr "dit is onmogelijk in automatische modus zonder het ‘--yes‘ commando\n"
 
-#: g10/delkey.c:139
+#: g10/delkey.c:147
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
-msgstr "Deze sleutel verwijderen uit de sleutelbos? "
+msgstr "Deze sleutel van uw sleutelring verwijderen? (j/N) "
 
-#: g10/delkey.c:147
+#: g10/delkey.c:155
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
-msgstr "Dit is een geheime sleutel! - echt verwijderen? "
+msgstr "Dit is een geheime sleutel! Weet U het zeker? (j/N) "
 
-#: g10/delkey.c:157
+#: g10/delkey.c:165
 #, c-format
 msgid "deleting keyblock failed: %s\n"
-msgstr "verwijderen sleutelblok mislukt: %s\n"
+msgstr "verwijderen van sleutelblok is mislukt: %s\n"
 
-#: g10/delkey.c:167
+#: g10/delkey.c:175
 msgid "ownertrust information cleared\n"
-msgstr "eigenaarsvertrouwen informatie gewist\n"
+msgstr "vertrouwlijkheidsgegevens zijn gewist\n"
 
-#: g10/delkey.c:195
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
-msgstr "er is een geheime sleutel voor openbare sleutel \"%s\"!\n"
+msgstr "er is een geheime sleutel voor de publieke sleutel ‘%s‘!\n"
 
-#: g10/delkey.c:197
+#: g10/delkey.c:208
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
-msgstr ""
-"gebruik de optie \"--delete-secret-keys\" om deze eerst te verwijderen.\n"
+msgstr "gebruik eerst het commando ‘--delete-secret-keys‘ om te verwijderen.\n"
 
-#: g10/encode.c:210 g10/sign.c:1186
+#: g10/encode.c:213 g10/sign.c:1286
 #, c-format
 msgid "error creating passphrase: %s\n"
-msgstr "fout bij maken wachtwoord: %s\n"
+msgstr "fout bij het maken van de geheime zin: %s\n"
 
-#: g10/encode.c:215
+#: g10/encode.c:218
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr "kan geen symmetrisch ESK-pakket gebruiken vanwege de S2K-modus\n"
+msgstr "kan geen symmetrish ESK paket gebruiken door de S2K modus\n"
 
-#: g10/encode.c:228
-#, fuzzy, c-format
+#: g10/encode.c:231
+#, c-format
 msgid "using cipher %s\n"
-msgstr "ondertekenen mislukt: %s\n"
+msgstr "versleutelalgoritme %s in gebruik\n"
 
-#: g10/encode.c:238 g10/encode.c:558
+#: g10/encode.c:241 g10/encode.c:536
 #, c-format
 msgid "`%s' already compressed\n"
-msgstr "`%s' is al ingepakt\n"
+msgstr "‘%s’ is reeds gecomprimeerd\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550
+#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
-msgstr "WAARSCHUWING: `%s' is een leeg bestand\n"
+msgstr "Waarschuwing: ‘%s’ is een leeg bestand\n"
 
-#: g10/encode.c:472
+#: g10/encode.c:456
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
-"u kunt slechts coderen naar RSA-sleutels van 2048 bits of minder in --pgp2 "
-"modus\n"
+"U kan alleen maar een RSA sleutel van 2048 bits of minder gebruiken\n"
+"met het --pgp2 commando \n"
 
-#: g10/encode.c:494
+#: g10/encode.c:480
 #, c-format
 msgid "reading from `%s'\n"
-msgstr "bezig met lezen uit `%s'\n"
+msgstr "lezen van ‘%s’\n"
 
-#: g10/encode.c:530
+#: g10/encode.c:508
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
-"kan de IDEA-codering niet gebruiken voor alle sleutels waarnaar u codeert.\n"
+"het is onmogelijk het IDEA versleutelalgoritme te gebruiken voor de\n"
+"gekozen sleutels.\n"
 
-#: g10/encode.c:540
-#, fuzzy, c-format
+#: g10/encode.c:518
+#, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
-"het afdwingen van symmetrische codering %s (%d) gaat tegen de voorkeuren van "
-"de ontvanger in\n"
+"Waarschuwing: het forceren van het symetrisch versleutelalgoritme %s (%d)\n"
+"gaat tegen de wens van de ontvanger in\n"
 
-#: g10/encode.c:648 g10/sign.c:877
-#, fuzzy, c-format
+#: g10/encode.c:628 g10/sign.c:963
+#, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr ""
-"het afdwingen van inpakalgoritme %s (%d) gaat tegen de voorkeuren van de "
-"ontvanger in\n"
+"Waarschuwing: het forceren van het compressie algoritme %s (%d) gaat\n"
+"tegen de wens van de ontvanger in\n"
 
-#: g10/encode.c:735
+#: g10/encode.c:715
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
-"het afdwingen van symmetrische codering %s (%d) gaat tegen de voorkeuren van "
-"de ontvanger in\n"
+"het forceren van het symetrisch versleutelalgoritme %s (%d) gaat\n"
+"tegen de wens van de ontvanger in\n"
 
-#: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
+#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
-msgstr "u kunt %s niet gebruiken in %s modus\n"
+msgstr "U mag %s niet gebruiken in combinatie met %s\n"
 
-#: g10/encode.c:832
+#: g10/encode.c:812
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s gecodeerd voor: \"%s\"\n"
+msgstr "%s/%s versleuteld voor: “%s”\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:301
+#: g10/encr-data.c:91 g10/mainproc.c:292
 #, c-format
 msgid "%s encrypted data\n"
-msgstr "%s gecodeerde gegevens\n"
+msgstr "%s versleutelde gegevens\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:305
+#: g10/encr-data.c:93 g10/mainproc.c:296
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
-msgstr "gecodeerd met onbekend algoritme %d\n"
+msgstr "versleuteld met onbekend algoritme %d\n"
 
-#: g10/encr-data.c:92
+#: g10/encr-data.c:117
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
-"WAARSCHUWING: bericht was gecodeerd met een zwakke sleutel in de "
-"symmetrische codering.\n"
+"Waarschuwing: het bericht is versleuteld met een zwakke sleutel in het\n"
+"symetriche versleutelalgoritme.\n"
 
-#: g10/encr-data.c:103
+#: g10/encr-data.c:128
 msgid "problem handling encrypted packet\n"
-msgstr "probleem bij verwerken gecodeerd pakket\n"
+msgstr "probleem met het verwerken van het versleutelde pakket\n"
 
-#: g10/exec.c:48
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
-msgstr "uitvoeren van andere programma's niet ondersteund\n"
+msgstr "het starten van externe programma's wordt niet ondersteund\n"
 
-#: g10/exec.c:184 g10/openfile.c:406
+#: g10/exec.c:176 g10/openfile.c:421
 #, c-format
 msgid "can't create directory `%s': %s\n"
-msgstr "kan map `%s' niet aanmaken: %s\n"
+msgstr "kan map ‘%s’ niet maken: %s\n"
 
-#: g10/exec.c:325
+#: g10/exec.c:317
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
-"aanroepen van externe programma's zijn uit gezet vanwege onveilige opties-"
-"bestandstoegangsrechten\n"
+"externe programma's zijn niet toegestaan omdat bestanbds permissies onveilig "
+"zijn\n"
 
-#: g10/exec.c:355
-#, fuzzy
+#: g10/exec.c:347
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
-"dit platform vereist het maken van tijdelijke bestanden bij het aanroepen "
-"van externe programma's\n"
+"het is op dit platform noodzakelijk tijdelijke bestanden aan te maken\n"
 
-#: g10/exec.c:433
-#, fuzzy, c-format
+#: g10/exec.c:425
+#, c-format
 msgid "unable to execute program `%s': %s\n"
-msgstr "kan %s \"%s\" niet uitvoeren: %s\n"
+msgstr "kan programma ‘%s’ niet starten: %s\n"
 
-#: g10/exec.c:436
-#, fuzzy, c-format
+#: g10/exec.c:428
+#, c-format
 msgid "unable to execute shell `%s': %s\n"
-msgstr "kan %s \"%s\" niet uitvoeren: %s\n"
+msgstr "kan programma ‘%s’ niet starten: %s\n"
 
-#: g10/exec.c:521
+#: g10/exec.c:513
 #, c-format
 msgid "system error while calling external program: %s\n"
-msgstr "systeemfout bij aanroepen van extern programma: %s\n"
+msgstr "systeemfout bij het aanroepen van een extern programma: %s\n"
 
-#: g10/exec.c:532 g10/exec.c:598
+#: g10/exec.c:524 g10/exec.c:590
 msgid "unnatural exit of external program\n"
-msgstr "ongewone afsluiting van extern programma\n"
+msgstr "unverwacht einde van een extern programma\n"
 
-#: g10/exec.c:547
+#: g10/exec.c:539
 msgid "unable to execute external program\n"
-msgstr "kan extern programma niet uitvoeren\n"
+msgstr "het is onmogelijk het externe programma te starten\n"
 
-#: g10/exec.c:563
+#: g10/exec.c:555
 #, c-format
 msgid "unable to read external program response: %s\n"
-msgstr "kan antwoord van extern programma niet lezen: %s\n"
+msgstr ""
+"het is onmogelijk het antwoord van het externe programma te lezen: %s\n"
 
-#: g10/exec.c:609 g10/exec.c:616
+#: g10/exec.c:601 g10/exec.c:608
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
-msgstr "WAARSCHUWING: kan tijdelijke bestand (%s) `%s' niet verwijderen: %s\n"
+msgstr ""
+"Waarschuwing: tijdelijk bestand kan niet worden verwijderd (%s) ‘%s’: %s\n"
 
-#: g10/exec.c:621
+#: g10/exec.c:613
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
-msgstr "WAARSCHUWING: kan tijdelijke map `%s' niet verwijderen: %s\n"
+msgstr "Waarschuwing: tijdelijke map kan niet worden verwijderd ‘%s’: %s\n"
 
-#: g10/export.c:176
-#, fuzzy
+#: g10/export.c:61
+msgid "export signatures that are marked as local-only"
+msgstr "exporteerd allen ondertekeningen met de ’local-only’ markering"
+
+#: g10/export.c:63
+msgid "export attribute user IDs (generally photo IDs)"
+msgstr "exporteren van gebruikers ID attributen (Foto ID's)"
+
+#: g10/export.c:65
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "exporteren van intrekkingssleutels met ’gevoelig’ markering"
+
+#: g10/export.c:67
+msgid "remove the passphrase from exported subkeys"
+msgstr "verwijderen van de ’geheime zin’ van geexporteerde sub-sleutels"
+
+#: g10/export.c:69
+msgid "remove unusable parts from key during export"
+msgstr "verwijder onbruikbare delen van de sleutel tijdens export"
+
+#: g10/export.c:71
+msgid "remove as much as possible from key during export"
+msgstr "verwijder zo veel mogelijk van de sleutel tijdens export"
+
+#: g10/export.c:325
 msgid "exporting secret keys not allowed\n"
-msgstr "bezig met schrijven geheime sleutel naar `%s'\n"
+msgstr "het exportern van geheime sleutels is niet toegestaan\n"
 
-#: g10/export.c:206
-#, fuzzy, c-format
+#: g10/export.c:354
+#, c-format
 msgid "key %s: not protected - skipped\n"
-msgstr "sleutel %08lX: niet beschermd - overgeslagen\n"
+msgstr "sleutel %s: niet beveiligd - overgeslagen\n"
 
-#: g10/export.c:214
-#, fuzzy, c-format
+#: g10/export.c:362
+#, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
-msgstr "sleutel %08lX: PGP 2.x stijl sleutel - overgeslagen\n"
+msgstr "sleutel %s: PGP 2.x sleutel - overgeslagen\n"
+
+#: g10/export.c:373
+#, c-format
+msgid "key %s: key material on-card - skipped\n"
+msgstr "sleutel %s: sleutelmateriaal op kaart - overgeslagen\n"
 
-#: g10/export.c:361
-#, fuzzy, c-format
+#: g10/export.c:521
+msgid "about to export an unprotected subkey\n"
+msgstr "exporteren van een onbeveiligde sub-sleutel\n"
+
+#: g10/export.c:544
+#, c-format
+msgid "failed to unprotect the subkey: %s\n"
+msgstr "het is mislukt de beveiliging van sub-sleutel te halen: %s\n"
+
+#: g10/export.c:565
+#, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
-msgstr ""
-"WAARSCHUWING: geheime sleutel %08lX heeft geen eenvoudige SK controlesom\n"
+msgstr "Waarschuwing: geheime sleutel %s heeft geen eenvoudige ’SK checksum’\n"
 
-#: g10/export.c:393
+#: g10/export.c:598
 msgid "WARNING: nothing exported\n"
-msgstr "WAARSCHUWING: niets uitgevoerd\n"
+msgstr "Waarschuwing: er is niets geexporteerd\n"
 
-#: g10/g10.c:358
+#: g10/gpg.c:379
 msgid ""
 "@Commands:\n"
 " "
 msgstr ""
-"@Opdrachten:\n"
+"@Commando's:\n"
 " "
 
-#: g10/g10.c:360
+#: g10/gpg.c:381
 msgid "|[file]|make a signature"
-msgstr "|[bestand]|een ondertekening maken"
+msgstr "|[bestand]|maak een ondertekening"
 
-#: g10/g10.c:361
+#: g10/gpg.c:382
 msgid "|[file]|make a clear text signature"
-msgstr "|[bestand]|een niet-gecodeerde ondertekening maken"
+msgstr "|[bestand]|maak een platte tekst ondertekening"
 
-#: g10/g10.c:362
+#: g10/gpg.c:383
 msgid "make a detached signature"
-msgstr "een losse ondertekening maken"
+msgstr "maak een losse ondertekening"
 
-#: g10/g10.c:363
+#: g10/gpg.c:384
 msgid "encrypt data"
-msgstr "gegevens coderen"
+msgstr "versleutel informatie"
 
-#: g10/g10.c:365
+#: g10/gpg.c:386
 msgid "encryption only with symmetric cipher"
-msgstr "slechts met symmetrische codering coderen"
+msgstr "versleutelen met een symetrisch versleutelalgoritme"
 
-#: g10/g10.c:367
+#: g10/gpg.c:388
 msgid "decrypt data (default)"
-msgstr "gegevens decoderen (standaard)"
+msgstr "ontcijferen informatie (standaard)"
 
-#: g10/g10.c:369
+#: g10/gpg.c:390
 msgid "verify a signature"
-msgstr "een ondertekening controleren"
+msgstr "controleren van een ondertekening"
 
-#: g10/g10.c:371
+#: g10/gpg.c:392
 msgid "list keys"
-msgstr "sleutels opsommen"
+msgstr "tonen van sleutels"
 
-#: g10/g10.c:373
+#: g10/gpg.c:394
 msgid "list keys and signatures"
-msgstr "sleutels en ondertekeningen opsommen"
+msgstr "tonen van sleutels en ondertekeningen"
 
-#: g10/g10.c:374
-#, fuzzy
+#: g10/gpg.c:395
 msgid "list and check key signatures"
-msgstr "sleutelondertekeningen controleren"
+msgstr "tonen en controleren van ondertekeningen"
 
-#: g10/g10.c:375
+#: g10/gpg.c:396
 msgid "list keys and fingerprints"
-msgstr "sleutels en vingerafdrukken opsommen"
+msgstr "tonen van sleutels en vingerafdrukken"
 
-#: g10/g10.c:376
+#: g10/gpg.c:397
 msgid "list secret keys"
-msgstr "geheime sleutels opsommen"
+msgstr "tonen geheime sleutels"
 
-#: g10/g10.c:377
+#: g10/gpg.c:398
 msgid "generate a new key pair"
-msgstr "een nieuw sleutelpaar genereren"
+msgstr "aanmaken van een nieuw sleutelpaar"
 
-#: g10/g10.c:378
+#: g10/gpg.c:399
 msgid "remove keys from the public keyring"
-msgstr "sleutels uit de openbare sleutelbos verwijderen"
+msgstr "verwijderen van sleutels uit de publieke sleutelring"
 
-#: g10/g10.c:380
+#: g10/gpg.c:401
 msgid "remove keys from the secret keyring"
-msgstr "sleutels uit de geheime sleutelbos verwijderen"
+msgstr "verwijderen van sleutels uit de geheime sleutelring"
 
-#: g10/g10.c:381
+#: g10/gpg.c:402
 msgid "sign a key"
-msgstr "een sleutel ondertekenen"
+msgstr "onderteken een sleutel"
 
-#: g10/g10.c:382
+#: g10/gpg.c:403
 msgid "sign a key locally"
-msgstr "een sleutel lokaal ondertekenen"
+msgstr "onderteken een sleutel voor persoonlijke doeleinden"
 
-#: g10/g10.c:385
+#: g10/gpg.c:404
 msgid "sign or edit a key"
-msgstr "een sleutel ondertekenen of bewerken"
+msgstr "onderteken of verander een sleutel"
 
-#: g10/g10.c:386
+#: g10/gpg.c:405
 msgid "generate a revocation certificate"
-msgstr "een herroepingscertificaat genereren"
+msgstr "aanmaken van een intrekkingssleutel certificaat"
 
-#: g10/g10.c:388
+#: g10/gpg.c:407
 msgid "export keys"
-msgstr "sleutels uitvoeren"
+msgstr "exporteren sleutels"
 
-#: g10/g10.c:389
+#: g10/gpg.c:408
 msgid "export keys to a key server"
-msgstr "sleutels uitvoeren naar een sleutelserver"
+msgstr "exporteren van sleutels naar een sleutel server"
 
-#: g10/g10.c:390
+#: g10/gpg.c:409
 msgid "import keys from a key server"
-msgstr "sleutels invoeren van een sleutelserver"
+msgstr "importeren van sleutels van een sleutel server"
 
-#: g10/g10.c:392
+#: g10/gpg.c:411
 msgid "search for keys on a key server"
-msgstr "zoeken naar sleutels op een sleutelserver"
+msgstr "zoeken naar sleutels op een sleutel server"
 
-#: g10/g10.c:394
+#: g10/gpg.c:413
 msgid "update all keys from a keyserver"
-msgstr "alle sleutels bijwerken vanaf een sleutelserver"
+msgstr "alle sleutels verversen vanaf een sleutel server"
 
-#: g10/g10.c:397
+#: g10/gpg.c:417
 msgid "import/merge keys"
-msgstr "sleutels invoeren/samenvoegen"
+msgstr "importeren/samenvoegen sleutels"
 
-#: g10/g10.c:400
+#: g10/gpg.c:420
 msgid "print the card status"
-msgstr ""
+msgstr "opvragen kaart status"
 
-#: g10/g10.c:401
+#: g10/gpg.c:421
 msgid "change data on a card"
-msgstr ""
+msgstr "wijzigen van gegevens op de kaart"
 
-#: g10/g10.c:402
+#: g10/gpg.c:422
 msgid "change a card's PIN"
-msgstr ""
+msgstr "wijzigen van de kaart PIN"
 
-#: g10/g10.c:410
+#: g10/gpg.c:431
 msgid "update the trust database"
-msgstr "de vertrouwensgegevensbank bijwerken"
+msgstr "verversen van de vertrouwens lijst"
 
-#: g10/g10.c:417
+#: g10/gpg.c:438
 msgid "|algo [files]|print message digests"
-msgstr "|algoritme [bestanden]|berichtdigest weergeven"
+msgstr "|algo [bestanden]|tonen samenvatting"
 
-#: g10/g10.c:421 g10/gpgv.c:65
+#: g10/gpg.c:442 g10/gpgv.c:70
 msgid ""
 "@\n"
 "Options:\n"
@@ -1065,60 +1160,59 @@ msgstr ""
 "Opties:\n"
 " "
 
-#: g10/g10.c:423
+#: g10/gpg.c:444
 msgid "create ascii armored output"
-msgstr "ASCII-bepantserde uitvoer maken"
+msgstr "aanmaken ascii versleutelde uitvoer"
 
-#: g10/g10.c:425
+#: g10/gpg.c:446
 msgid "|NAME|encrypt for NAME"
-msgstr "|NAAM|coderen voor NAAM"
+msgstr "|NAAM|versleutelen voor NAAM"
 
-#: g10/g10.c:436
+#: g10/gpg.c:457
 msgid "use this user-id to sign or decrypt"
-msgstr "deze gebruikerscode gebruiken om te ondertekenen of decoderen"
+msgstr "gebruik deze gebruikers ID voor ondertekening of decoderen"
 
-#: g10/g10.c:437
+#: g10/gpg.c:458
 msgid "|N|set compress level N (0 disables)"
-msgstr "|N|inpakniveau N instellen (0 zet dit uit)"
+msgstr "|N|instellen compressie niveau N (0 voor geen)"
 
-#: g10/g10.c:442
+#: g10/gpg.c:463
 msgid "use canonical text mode"
-msgstr "kanonieke tekstmodus gebruiken"
+msgstr "gebruik normale tekst modus"
 
-#: g10/g10.c:452
+#: g10/gpg.c:477
 msgid "use as output file"
-msgstr "gebruiken als uitvoerbestand"
+msgstr "gebruik als uitvoer bestand"
 
-#: g10/g10.c:454 g10/gpgv.c:67
+#: g10/gpg.c:479 g10/gpgv.c:72
 msgid "verbose"
-msgstr "breedsprakig"
+msgstr "langdradig"
 
-#: g10/g10.c:465
+#: g10/gpg.c:490
 msgid "do not make any changes"
-msgstr "geen wijzigingen maken"
+msgstr "maak geen wijzigingen"
 
-#: g10/g10.c:466
+#: g10/gpg.c:491
 msgid "prompt before overwriting"
-msgstr "vragen alvorens te overschrijven"
+msgstr "vragen voor overschrijven"
 
-#: g10/g10.c:511
+#: g10/gpg.c:532
 msgid "use strict OpenPGP behavior"
-msgstr ""
+msgstr "strikt OpenPGP gedrag toepassen"
 
-#: g10/g10.c:512
+#: g10/gpg.c:533
 msgid "generate PGP 2.x compatible messages"
-msgstr ""
+msgstr "PGP 2.x uitwisselbare berichten aanmaken"
 
-#: g10/g10.c:537
+#: g10/gpg.c:562
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 "@\n"
-"(Zie de man-handleiding voor een volledige lijst met alle opdrachten en "
-"opties)\n"
+"(lees de handleiding voor een complete lijst van commando's)\n"
 
-#: g10/g10.c:540
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1132,624 +1226,731 @@ msgstr ""
 "@\n"
 "Voorbeelden:\n"
 "\n"
-" -se -r Bob [bestand]       ondertekenen en coderen voor gebruiker Bob\n"
-" --clearsign [bestand]      een niet-gecodeerde ondertekening maken\n"
-" --detach-sign [bestand]    een losse ondertekening maken\n"
-" --list-keys [namen]        sleutels weergeven\n"
-" --fingerprint [namen]      vingerafdrukken weergeven\n"
+" -se -r Bob [bestand]       onderteken en versleutel voor Bob\n"
+" --clearsign [bestand]      maak een platte tekst ondertekening\n"
+" --detach-sign [bestand]    maak een ontkoppelde ondertekening\n"
+" --list-keys [namen]        toon sleutels\n"
+" --fingerprint [namen]      toon vingerafdrukken\n"
 
-#: g10/g10.c:726 g10/gpgv.c:92
+#: g10/gpg.c:766 g10/gpgv.c:97
 msgid "Please report bugs to <[email protected]>.\n"
-msgstr ""
-"Rapporteer softwarefouten alstublieft aan <[email protected]>.\n"
-"Rapporteer fouten in de vertaling alstublieft aan <[email protected]>.\n"
+msgstr "Fouten graag melden aan <[email protected]>.\n"
 
-#: g10/g10.c:743
+#: g10/gpg.c:783
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Gebruik: gpg [opties] [bestanden] (-h voor hulp)"
 
-#: g10/g10.c:746
+#: g10/gpg.c:786
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
 "default operation depends on the input data\n"
 msgstr ""
-"Syntaxis: gpg [opties] [bestanden]\n"
-"ondertekenen, controleren, coderen of decoderen\n"
-"standaardbewerking hangt af van invoergegevens\n"
+"Gebruik: gpg [opties] [bestanden]\n"
+"onderteken, controleer, versleutel of decodeer\n"
+"standaard actie wordt bepaald door de invoer\n"
 
-#: g10/g10.c:757
+#: g10/gpg.c:797
 msgid ""
 "\n"
 "Supported algorithms:\n"
 msgstr ""
 "\n"
-"Ondersteunde algoritmes:\n"
+"Ondersteunde algoritmen:\n"
 
-#: g10/g10.c:760
+#: g10/gpg.c:800
 msgid "Pubkey: "
-msgstr "Openbare sleutel: "
+msgstr "Publike sleutel: "
 
-#: g10/g10.c:766 g10/keyedit.c:1901
+#: g10/gpg.c:806 g10/keyedit.c:2304
 msgid "Cipher: "
-msgstr "Codering: "
+msgstr "Versleutel algoritme: "
 
-#: g10/g10.c:772
+#: g10/gpg.c:812
 msgid "Hash: "
-msgstr "Hash: "
+msgstr "Samenvattings algoritme: "
 
-#: g10/g10.c:778 g10/keyedit.c:1947
+#: g10/gpg.c:818 g10/keyedit.c:2350
 msgid "Compression: "
 msgstr "Compressie: "
 
-#: g10/g10.c:861
+#: g10/gpg.c:901
 msgid "usage: gpg [options] "
 msgstr "gebruik: gpg [opties] "
 
-#: g10/g10.c:964
+#: g10/gpg.c:1049
 msgid "conflicting commands\n"
-msgstr "conflicterende opdrachten\n"
+msgstr "conflicterende commando's\n"
 
-#: g10/g10.c:982
-#, fuzzy, c-format
+#: g10/gpg.c:1067
+#, c-format
 msgid "no = sign found in group definition `%s'\n"
-msgstr "geen =-teken gevonden in groepdefinitie \"%s\"\n"
+msgstr "no = teken gevonden in groep definitie ‘%s’\n"
 
-#: g10/g10.c:1179
-#, fuzzy, c-format
+#: g10/gpg.c:1264
+#, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
-msgstr "WAARSCHUWING: onveilig eigendom op %s \"%s\"\n"
+msgstr ""
+"Waarschuwing: onveilige eigendomsinstellingen van thuisdirectory ‘%s’\n"
 
-#: g10/g10.c:1182
-#, fuzzy, c-format
+#: g10/gpg.c:1267
+#, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
-msgstr "WAARSCHUWING: onveilig eigendom op %s \"%s\"\n"
+msgstr ""
+"Waarschuwing: onveilige eigendomsinstellingen van configuratie bestand ‘%s’\n"
 
-#: g10/g10.c:1185
-#, fuzzy, c-format
+#: g10/gpg.c:1270
+#, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
-msgstr "WAARSCHUWING: onveilig eigendom op %s \"%s\"\n"
+msgstr "Waarschuwing: onveilige eigendomsinstellingen van uitbreiding ‘%s’\n"
 
-#: g10/g10.c:1191
-#, fuzzy, c-format
+#: g10/gpg.c:1276
+#, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
-msgstr "WAARSCHUWING: onveilige toegangsrechten op %s \"%s\"\n"
+msgstr ""
+"Waarschuwing: onveilige beveiligingsinstellingen van thuisdirectory ‘%s’\n"
 
-#: g10/g10.c:1194
-#, fuzzy, c-format
+#: g10/gpg.c:1279
+#, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
-msgstr "WAARSCHUWING: onveilige toegangsrechten op %s \"%s\"\n"
+msgstr ""
+"Waarschuwing: onveilige beveiligingsinstellingen van configuratie bestand ‘%"
+"s’\n"
 
-#: g10/g10.c:1197
-#, fuzzy, c-format
+#: g10/gpg.c:1282
+#, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
-msgstr "WAARSCHUWING: onveilige toegangsrechten op %s \"%s\"\n"
+msgstr ""
+"Waarschuwing: onveilige beveiligingsinstellingen van uitbreiding ‘%s’\n"
 
-#: g10/g10.c:1203
-#, fuzzy, c-format
+#: g10/gpg.c:1288
+#, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
-msgstr "WAARSCHUWING: onveilig omsluitend mapeigendom op %s \"%s\"\n"
+msgstr ""
+"Waarschuwing: onveilige map eigendomsinstellingen van thuisdirectory ‘%s’\n"
 
-#: g10/g10.c:1206
-#, fuzzy, c-format
+#: g10/gpg.c:1291
+#, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
-msgstr "WAARSCHUWING: onveilig omsluitend mapeigendom op %s \"%s\"\n"
+msgstr ""
+"Waarschuwing: onveilige map eigendomsinstellingen van configuratie bestand ‘%"
+"s’\n"
 
-#: g10/g10.c:1209
-#, fuzzy, c-format
+#: g10/gpg.c:1294
+#, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
-msgstr "WAARSCHUWING: onveilig omsluitend mapeigendom op %s \"%s\"\n"
+msgstr ""
+"Waarschuwing: onveilige map eigendomsinstellingen van uitbreiding ‘%s’\n"
 
-#: g10/g10.c:1215
-#, fuzzy, c-format
+#: g10/gpg.c:1300
+#, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
-msgstr "WAARSCHUWING: onveilige omsluitende maptoegangsrechten op %s \"%s\"\n"
+msgstr ""
+"Waarschuwing: onveilige map beveiligingsinstellingen van thuisdirectory ‘%"
+"s’\n"
 
-#: g10/g10.c:1218
-#, fuzzy, c-format
+#: g10/gpg.c:1303
+#, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
-msgstr "WAARSCHUWING: onveilige omsluitende maptoegangsrechten op %s \"%s\"\n"
+msgstr ""
+"Waarschuwing: onveilige map beveiligingsinstellingen van configuratie "
+"bestand ‘%s’\n"
 
-#: g10/g10.c:1221
-#, fuzzy, c-format
+#: g10/gpg.c:1306
+#, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
-msgstr "WAARSCHUWING: onveilige omsluitende maptoegangsrechten op %s \"%s\"\n"
+msgstr ""
+"Waarschuwing: onveilige map beveiligingsinstellingen van uitbreiding ‘%s’\n"
 
-#: g10/g10.c:1362
-#, fuzzy, c-format
+#: g10/gpg.c:1447
+#, c-format
 msgid "unknown configuration item `%s'\n"
-msgstr "nieuw configuratiebestand `%s' aangemaakt\n"
+msgstr "onbekend configuratie item ‘%s’\n"
+
+#: g10/gpg.c:1540
+msgid "display photo IDs during key listings"
+msgstr "tonen van foto ID bij sleutel lijsten"
+
+#: g10/gpg.c:1542
+msgid "show policy URLs during signature listings"
+msgstr "tonen van procedure URL's bij sleutel lijsten"
+
+#: g10/gpg.c:1544
+msgid "show all notations during signature listings"
+msgstr "tonan van alle opmerkingen bij sleutel lijsten"
+
+#: g10/gpg.c:1546
+msgid "show IETF standard notations during signature listings"
+msgstr "tonen van IETF opmerkingen bij sleutel lijsten"
+
+#: g10/gpg.c:1550
+msgid "show user-supplied notations during signature listings"
+msgstr "tonen van gebruikers opmerkingen bij sleutel lijsten"
+
+#: g10/gpg.c:1552
+msgid "show preferred keyserver URLs during signature listings"
+msgstr "tonen van voorkeur sluetel server bij sleutel lijsten"
 
-#: g10/g10.c:1762
+#: g10/gpg.c:1554
+msgid "show user ID validity during key listings"
+msgstr "tonen van gebruikers ID bij sleutel lijsten"
+
+#: g10/gpg.c:1556
+msgid "show revoked and expired user IDs in key listings"
+msgstr "tonen van ingetrokken en verlopen gebruikers ID's bij sleutel lijsten"
+
+#: g10/gpg.c:1558
+msgid "show revoked and expired subkeys in key listings"
+msgstr "tonen van ingetrokken en verlopen sub-sleutels bij sleutel lijsten"
+
+#: g10/gpg.c:1560
+msgid "show the keyring name in key listings"
+msgstr "tonen van de sleutelring naam bij sleutel lijsten"
+
+#: g10/gpg.c:1562
+msgid "show expiration dates during signature listings"
+msgstr "tonen van verval datum bij sleutel lijsten"
+
+#: g10/gpg.c:1957
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
-msgstr "LET OP: oude bestand voor standaard opties `%s' genegeerd\n"
+msgstr "Noot: oude standaard optie ‘%s‘ genegeerd\n"
 
-#: g10/g10.c:1804
+#: g10/gpg.c:1999
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
-msgstr "LET OP: geen bestand voor standaard opties `%s'\n"
+msgstr "Noot: geen standaard optie bestand ‘%s’\n"
 
-#: g10/g10.c:1808
+#: g10/gpg.c:2003
 #, c-format
 msgid "option file `%s': %s\n"
-msgstr "optiebestand `%s': %s\n"
+msgstr "optie bestand ‘%s’: %s\n"
 
-#: g10/g10.c:1815
+#: g10/gpg.c:2010
 #, c-format
 msgid "reading options from `%s'\n"
-msgstr "bezig met lezen opties uit `%s'\n"
+msgstr "lezen van opties uit ‘%s’\n"
 
-#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
-msgstr "LET OP: %s is niet voor normaal gebruik!\n"
+msgstr "Noot: %s is niet voor normaal gebruik!\n"
 
-#: g10/g10.c:2048
-#, fuzzy, c-format
+#: g10/gpg.c:2239
+#, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
-"coderingsuitbreiding \"%s\" niet geladen vanwege onveilige toegangsrechten\n"
+"versleutelalgoritme uitbreiding ‘%s’ is niet geladen door onveilige\n"
+"instellingen\n"
+
+#: g10/gpg.c:2405 g10/gpg.c:2417
+#, c-format
+msgid "`%s' is not a valid signature expiration\n"
+msgstr "‘%s’ is geen geldige ondertekening vervaldatum\n"
 
-#: g10/g10.c:2260
-#, fuzzy, c-format
+#: g10/gpg.c:2494
+#, c-format
 msgid "`%s' is not a valid character set\n"
-msgstr "%s is geen geldige tekenset\n"
+msgstr "‘%s’ is geen geldige tekenset\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3443
-#, fuzzy
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 msgid "could not parse keyserver URL\n"
-msgstr "kon sleutelserver URI niet inlezen\n"
+msgstr "het was niet mogelijk de sleutel server URL te lezen\n"
 
-#: g10/g10.c:2285
-#, fuzzy, c-format
+#: g10/gpg.c:2530
+#, c-format
 msgid "%s:%d: invalid keyserver options\n"
-msgstr "%s:%d: ongeldige uitvoeropties\n"
+msgstr "%s:%d: ongeldige sleutel server opties\n"
 
-#: g10/g10.c:2288
-#, fuzzy
+#: g10/gpg.c:2533
 msgid "invalid keyserver options\n"
-msgstr "ongeldige uitvoeropties\n"
+msgstr "ongeldige sleutel server opties\n"
 
-#: g10/g10.c:2295
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
-msgstr "%s:%d: ongeldige invoeropties\n"
+msgstr "%s:%d: ongeldige importeer opties\n"
 
-#: g10/g10.c:2298
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
-msgstr "ongeldige invoeropties\n"
+msgstr "ongeldige importeer opties\n"
 
-#: g10/g10.c:2305
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
-msgstr "%s:%d: ongeldige uitvoeropties\n"
+msgstr "%s:%d: ongeldige exporteer opties\n"
 
-#: g10/g10.c:2308
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
-msgstr "ongeldige uitvoeropties\n"
+msgstr "ongeldige exporteer opties\n"
 
-#: g10/g10.c:2315
-#, fuzzy, c-format
+#: g10/gpg.c:2560
+#, c-format
 msgid "%s:%d: invalid list options\n"
-msgstr "%s:%d: ongeldige invoeropties\n"
+msgstr "%s:%d: ongeldige lijst opties\n"
 
-#: g10/g10.c:2318
-#, fuzzy
+#: g10/gpg.c:2563
 msgid "invalid list options\n"
-msgstr "ongeldige invoeropties\n"
+msgstr "ongeldige lijst opties\n"
 
-#: g10/g10.c:2340
-#, fuzzy, c-format
-msgid "%s:%d: invalid verify options\n"
-msgstr "%s:%d: ongeldige uitvoeropties\n"
+#: g10/gpg.c:2571
+msgid "display photo IDs during signature verification"
+msgstr "tonen foto ID tijdens ondertekening controle"
+
+#: g10/gpg.c:2573
+msgid "show policy URLs during signature verification"
+msgstr "toon procedure URL tijdens ondertekening controle"
+
+#: g10/gpg.c:2575
+msgid "show all notations during signature verification"
+msgstr "toon alle opmerkingen tijdens ondertekening controle"
+
+#: g10/gpg.c:2577
+msgid "show IETF standard notations during signature verification"
+msgstr "toon IETF opmerkingen tijdens ondertekening controle"
 
-#: g10/g10.c:2343
+#: g10/gpg.c:2581
+msgid "show user-supplied notations during signature verification"
+msgstr "toon gebruiker opmerkingen tijdens ondertekening controle"
+
+#: g10/gpg.c:2583
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "toon voorkeurs sleutel server tijdens ondertekening controle"
+
+#: g10/gpg.c:2585
+msgid "show user ID validity during signature verification"
+msgstr "toon gebruiker ID geldigheid tijdens ondertekening controle"
+
+#: g10/gpg.c:2587
+msgid "show revoked and expired user IDs in signature verification"
+msgstr ""
+"toon ingetrokken en verlopen gebruiker ID's tijdens ondertekening controle"
+
+#: g10/gpg.c:2589
 #, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr ""
+"toon ingetrokken en verlopen gebruiker ID's tijdens ondertekening controle"
+
+#: g10/gpg.c:2591
+msgid "validate signatures with PKA data"
+msgstr "Controleer ondertekeningen met PKA gegevens"
+
+#: g10/gpg.c:2593
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr ""
+"Verhoog het vertrouwen van ondertekeningen met goedgekeurde PKA gegevens"
+
+#: g10/gpg.c:2600
+#, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: ongeldige controle opties\n"
+
+#: g10/gpg.c:2603
 msgid "invalid verify options\n"
-msgstr "ongeldige uitvoeropties\n"
+msgstr "ongeldige controle opties\n"
 
-#: g10/g10.c:2350
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
-msgstr "kan exec-path niet instellen op %s\n"
+msgstr "het is onmogelijk het programma start pad aan te passen naar %s\n"
 
-#: g10/g10.c:2540
+#: g10/gpg.c:2773
+#, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: ongeldige auto-key-locate lijst\n"
+
+#: g10/gpg.c:2776
+msgid "invalid auto-key-locate list\n"
+msgstr "ongeldige auto-key-locate lijst\n"
+
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
-msgstr "WAARSCHUWING: programma maakt mogelijk een core-bestand aan!\n"
+msgstr "Waarschuwing: het programma kan een core bestand genereren!\n"
 
-#: g10/g10.c:2544
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
-msgstr "WAARSCHUWING: %s gaat boven %s\n"
+msgstr "Waarschuwing: %s overschrijft %s\n"
 
-#: g10/g10.c:2553
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
-msgstr "%s niet toegestaan met %s!\n"
+msgstr "%s mag niet gebruikt worden met %s!\n"
 
-#: g10/g10.c:2556
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
-msgstr "%s slaat nergens op met %s!\n"
+msgstr "%s klopt niet samen met %s!\n"
+
+#: g10/gpg.c:2875
+#, c-format
+msgid "NOTE: %s is not available in this version\n"
+msgstr "Noot: %s is niet beschikbaar in deze versie\n"
 
-#: g10/g10.c:2577
+#: g10/gpg.c:2890
+#, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "werkt niet met onveilig geheugen door %s\n"
+
+#: g10/gpg.c:2904
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
-"u kunt alleen losse of ongecodeerde ondertekeningen maken in --pgp2 modus\n"
+"allen ontkoppelde of platte tekst ondertekeningen zijn mogelijk in --pgp2 "
+"modus\n"
 
-#: g10/g10.c:2583
+#: g10/gpg.c:2910
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
-msgstr "u kunt niet tegelijkertijd ondertekenen en coderen in --pgp2 modus\n"
+msgstr ""
+"het is niet mogelijk tegelijk te ondertekenen en versleutelen in --pgp2 "
+"modus\n"
 
-#: g10/g10.c:2589
+#: g10/gpg.c:2916
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
-msgstr "u dient bestanden te gebruiken (en niet een pijp) in --pgp2 modus.\n"
+msgstr "U moet bestanden (en geen pipe) gebruiken in --pgp2 modus.\n"
 
-#: g10/g10.c:2602
+#: g10/gpg.c:2929
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
-msgstr "het coderen van een bericht in --pgp2 modus vereist de IDEA-codering\n"
+msgstr ""
+"versleutelen in --pgp2 modus heeft het IDEA versleutelalgoritme nodig\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
-msgstr "het gekozen coderingsalgoritme is ongeldig\n"
+msgstr "ongeldig versleutelalgoritme gekozen\n"
 
-#: g10/g10.c:2678 g10/g10.c:2702
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
-msgstr "het gekozen digest-algoritme is ongeldig\n"
+msgstr "ongeldig samenvatting algoritme gekozen\n"
 
-#: g10/g10.c:2684
-#, fuzzy
+#: g10/gpg.c:3008
 msgid "selected compression algorithm is invalid\n"
-msgstr "het gekozen coderingsalgoritme is ongeldig\n"
+msgstr "ongeldige compressie gekozen\n"
 
-#: g10/g10.c:2690
+#: g10/gpg.c:3014
 msgid "selected certification digest algorithm is invalid\n"
-msgstr "het gekozen certificaat-digest-algoritme is ongeldig\n"
+msgstr "ongeldig certificaat samenvatting algoritme gekozen\n"
 
-#: g10/g10.c:2705
+#: g10/gpg.c:3029
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed moet groter zijn dan 0\n"
 
-#: g10/g10.c:2707
+#: g10/gpg.c:3031
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed moet groter zijn dan 1\n"
 
-#: g10/g10.c:2709
-#, fuzzy
+#: g10/gpg.c:3033
 msgid "max-cert-depth must be in the range from 1 to 255\n"
-msgstr "max-cert-depth moet binnen het bereik 1 tot 255 vallen\n"
+msgstr "max-cert-depth moet vallen tussen dan 1 en 255\n"
 
-#: g10/g10.c:2711
-#, fuzzy
+#: g10/gpg.c:3035
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
-msgstr "ongeldig standaard controleniveau; moet 0, 1, 2 of 3 zijn\n"
+msgstr "ongeldige default-cert-level; moet 0, 1, 2, of 3 zijn\n"
 
-#: g10/g10.c:2713
-#, fuzzy
+#: g10/gpg.c:3037
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
-msgstr "ongeldig standaard controleniveau; moet 0, 1, 2 of 3 zijn\n"
+msgstr "ongeldige min-cert-level; moet 1, 2, of 3 zijn\n"
 
-#: g10/g10.c:2716
+#: g10/gpg.c:3040
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
-msgstr "LET OP: eenvoudige S2K-modus (0) wordt sterk ontraden\n"
+msgstr "Noot: eenvoudige S2K modus (0) wordt sterk afgeraden\n"
 
-#: g10/g10.c:2720
+#: g10/gpg.c:3044
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
-msgstr "ongeldige S2K-modus; moet 0, 1 of 3 zijn\n"
+msgstr "ongeldige S2K modus; moet 0, 1 of 3\n"
 
-#: g10/g10.c:2727
+#: g10/gpg.c:3051
 msgid "invalid default preferences\n"
-msgstr "ongeldige standaardvoorkeuren\n"
+msgstr "ongeldige standaard voorkeuren\n"
 
-#: g10/g10.c:2736
+#: g10/gpg.c:3060
 msgid "invalid personal cipher preferences\n"
-msgstr "ongeldige persoonlijke coderingsvoorkeuren\n"
+msgstr "ongeldig persoonlijk versleutelalgoritme voorkeur\n"
 
-#: g10/g10.c:2740
+#: g10/gpg.c:3064
 msgid "invalid personal digest preferences\n"
-msgstr "ongeldige persoonlijke digestvoorkeuren\n"
+msgstr "ongeldig persoonlijk samenvattings algoritme voorkeur\n"
 
-#: g10/g10.c:2744
+#: g10/gpg.c:3068
 msgid "invalid personal compress preferences\n"
-msgstr "ongeldige persoonlijke inpakvoorkeuren\n"
+msgstr "ongeldig persoonlijk compressie algoritme voorkeur\n"
 
-#: g10/g10.c:2777
-#, fuzzy, c-format
+#: g10/gpg.c:3101
+#, c-format
 msgid "%s does not yet work with %s\n"
-msgstr "%s slaat nergens op met %s!\n"
+msgstr "%s werkt nog niet met %s\n"
 
-#: g10/g10.c:2824
-#, fuzzy, c-format
+#: g10/gpg.c:3148
+#, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
-msgstr "u kunt %s niet gebruiken in %s modus\n"
+msgstr "U mag versleutelalgoritme ‘%s’ niet gebruiken in %s modus\n"
 
-#: g10/g10.c:2829
-#, fuzzy, c-format
+#: g10/gpg.c:3153
+#, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
-msgstr "u kunt %s niet gebruiken in %s modus\n"
+msgstr "U mag samenvattings algoritme ‘%s’ niet gebruiken in %s modus\n"
 
-#: g10/g10.c:2834
-#, fuzzy, c-format
+#: g10/gpg.c:3158
+#, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
-msgstr "u kunt %s niet gebruiken in %s modus\n"
+msgstr "U mag compressie algoritme ‘%s’ niet gebruiken in %s modus\n"
 
-#: g10/g10.c:2930
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
-msgstr "initialiseren van vertrouwensgegevensbank mislukt: %s\n"
+msgstr "initialiseren van TrustDB is mislukt: %s\n"
 
-#: g10/g10.c:2941
+#: g10/gpg.c:3271
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
-"WAARSCHUWING: ontvangers (-r) gegeven zonder gebruik te maken van openbare "
-"sleutel codering\n"
+"Waarschuwing: er zijn ontvangers (-r) opgegeven zonder publieke sleutel "
+"versleuteling\n"
 
-#: g10/g10.c:2952
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [bestandsnaam]"
 
-#: g10/g10.c:2959
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [bestandsnaam]"
 
-#: g10/g10.c:2961
-#, fuzzy, c-format
+#: g10/gpg.c:3291
+#, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
-msgstr "decodering mislukt: %s\n"
+msgstr "symetrische versleuteling van ‘%s’ is mislukt: %s\n"
 
-#: g10/g10.c:2971
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [bestandsnaam]"
 
-#: g10/g10.c:2984
-#, fuzzy
+#: g10/gpg.c:3314
 msgid "--symmetric --encrypt [filename]"
-msgstr "--sign --encrypt [bestandsnaam]"
+msgstr "--symmetric --encrypt [bestandsnaam]"
 
-#: g10/g10.c:2986
+#: g10/gpg.c:3316
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
+"U kunt --symmetric --encrypt niet gebruiken met --s2k-mode 0 instelling\n"
 
-#: g10/g10.c:2989
-#, fuzzy, c-format
+#: g10/gpg.c:3319
+#, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
-msgstr "u kunt %s niet gebruiken in %s modus\n"
+msgstr "U kunt --symmetric --encrypt niet in %s modus gebruiken\n"
 
-#: g10/g10.c:3007
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [bestandsnaam]"
 
-#: g10/g10.c:3020
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [bestandsnaam]"
 
-#: g10/g10.c:3035
-#, fuzzy
+#: g10/gpg.c:3365
 msgid "--symmetric --sign --encrypt [filename]"
-msgstr "--sign --encrypt [bestandsnaam]"
+msgstr "--symmetric --sign --encrypt [bestandsnaam]"
 
-#: g10/g10.c:3037
+#: g10/gpg.c:3367
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
+"U kunt --symmetric --sign --encrypt niet gebruiken met --s2k-mode 0 "
+"instelling\n"
 
-#: g10/g10.c:3040
-#, fuzzy, c-format
+#: g10/gpg.c:3370
+#, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
-msgstr "u kunt %s niet gebruiken in %s modus\n"
+msgstr "U kunt --symmetric --sign --encrypt niet in %s modus gebruiken\n"
 
-#: g10/g10.c:3060
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [bestandsnaam]"
 
-#: g10/g10.c:3069
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [bestandsnaam]"
 
-#: g10/g10.c:3094
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [bestandsnaam]"
 
-#: g10/g10.c:3102
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
-msgstr "--sign-key gebruikerscode"
+msgstr "--sign-key gebruiker-id"
 
-#: g10/g10.c:3106
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
-msgstr "--lsign-key gebruikerscode"
-
-#: g10/g10.c:3110
-msgid "--nrsign-key user-id"
-msgstr "--nrsign-key gebruikerscode"
-
-#: g10/g10.c:3114
-msgid "--nrlsign-key user-id"
-msgstr "--nrlsign-key gebruikerscode"
+msgstr "--lsign-key gebruiker-id"
 
-#: g10/g10.c:3138
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
-msgstr "--edit-key gebruikerscode [opdrachten]"
+msgstr "--edit-key gebruiker-id [commando's]"
 
-#: g10/g10.c:3209
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
-msgstr "-k[v][v][v][c] [gebruikerscode] [sleutelbos]"
+msgstr "-k[v][v][v][c] [gebruiker-id] [sleutelringbestand]"
 
-#: g10/g10.c:3246
-#, fuzzy, c-format
+#: g10/gpg.c:3570
+#, c-format
 msgid "keyserver send failed: %s\n"
-msgstr "Sleutelaanmaak mislukt: %s\n"
+msgstr "sleutelserver verzending is mislukt: %s\n"
 
-#: g10/g10.c:3248
-#, fuzzy, c-format
+#: g10/gpg.c:3572
+#, c-format
 msgid "keyserver receive failed: %s\n"
-msgstr "Sleutelaanmaak mislukt: %s\n"
+msgstr "sleutelserver opvraging is mislukt: %s\n"
 
-#: g10/g10.c:3250
-#, fuzzy, c-format
+#: g10/gpg.c:3574
+#, c-format
 msgid "key export failed: %s\n"
-msgstr "Sleutelaanmaak mislukt: %s\n"
+msgstr "sleutel exporteren is mislukt: %s\n"
 
-#: g10/g10.c:3261
-#, fuzzy, c-format
+#: g10/gpg.c:3585
+#, c-format
 msgid "keyserver search failed: %s\n"
-msgstr "Sleutelaanmaak mislukt: %s\n"
+msgstr "sleutelserver zoekvraag is mislukt: %s\n"
 
-#: g10/g10.c:3271
-#, fuzzy, c-format
+#: g10/gpg.c:3595
+#, c-format
 msgid "keyserver refresh failed: %s\n"
-msgstr "bijwerken geheim mislukt: %s\n"
+msgstr "sleutelserver verversing is mislukt: %s\n"
 
-#: g10/g10.c:3312
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
-msgstr "ontpantseren mislukt: %s\n"
+msgstr "verwijderen van versleuteling is mislukt: %s\n"
 
-#: g10/g10.c:3320
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
-msgstr "bepantseren mislukt: %s\n"
+msgstr "plaatsen van versleuteling is mislukt: %s\n"
 
-#: g10/g10.c:3407
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
-msgstr "ongeldig hash-algoritme `%s'\n"
+msgstr "ongeldig berichtsamenvattings algoritme ‘%s’\n"
 
-#: g10/g10.c:3530
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[bestandsnaam]"
 
-#: g10/g10.c:3534
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
-msgstr "Ga uw gang en typ uw bericht...\n"
+msgstr "Begin uw bericht te typen ...\n"
 
-#: g10/g10.c:3824
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\n"
-msgstr ""
-"een notatienaam mag slechts afdrukbare tekens of spaties bevatten, en moet "
-"eindigen met een '='\n"
-
-#: g10/g10.c:3832
-msgid "a user notation name must contain the '@' character\n"
-msgstr "een gebruikersnotatienaam moet het '@'-teken bevatten\n"
-
-#: g10/g10.c:3842
-msgid "a notation value must not use any control characters\n"
-msgstr "een notatiewaarde mag geen stuurtekens bevatten\n"
-
-#: g10/g10.c:3876
+#: g10/gpg.c:4172
 msgid "the given certification policy URL is invalid\n"
-msgstr "de gegeven certificatiebeleid URL is ongeldig\n"
+msgstr "de opgegeven certificaat procedure URL is ongeldig\n"
 
-#: g10/g10.c:3878
+#: g10/gpg.c:4174
 msgid "the given signature policy URL is invalid\n"
-msgstr "de gegeven ondertekeningbeleid URL is ongeldig\n"
+msgstr "de opgegeven ondertekening procedure URL is ongeldig\n"
 
-#: g10/g10.c:3911
-#, fuzzy
+#: g10/gpg.c:4207
 msgid "the given preferred keyserver URL is invalid\n"
-msgstr "de gegeven ondertekeningbeleid URL is ongeldig\n"
+msgstr "de opgegeven sleutelserver URL is ongeldig\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:152
 msgid "too many entries in pk cache - disabled\n"
-msgstr "teveel ingangen in pk buffer - uit gezet\n"
+msgstr "te veel regels in pk cache - uitgeschakeld\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2691
-#, fuzzy
+#: g10/getkey.c:175
 msgid "[User ID not found]"
-msgstr "[Gebruikerscode niet gevonden]"
+msgstr "[Gebruiker ID niet gevonden]"
+
+#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
+#: g10/getkey.c:999
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr "‘%s’ automatisch opgehaald via %s\n"
 
-#: g10/getkey.c:1614
-#, fuzzy, c-format
+#: g10/getkey.c:1826
+#, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
-"Ongeldige sleutel %08lX geldig gemaakt met --allow-non-selfsigned-uid\n"
+"Ongeldeige sleutel %s is geldig gemaakt met --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2169
-#, fuzzy, c-format
+#: g10/getkey.c:2383 g10/keyedit.c:3717
+#, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
-msgstr "geen geheime deelsleutel voor openbare deelsleutel %08lX - genegeerd\n"
+msgstr "geen geheime sub-sleutel voor publieke sub-sleutel %s - overgeslagen\n"
 
-#: g10/getkey.c:2400
-#, fuzzy, c-format
-msgid "using secondary key %s instead of primary key %s\n"
+#: g10/getkey.c:2614
+#, c-format
+msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
-"de secundaire sleutel %08lX wordt gebruikt in plaats van primaire sleutel %"
-"08lX\n"
+"er wordt gebruik gemaakt van sub-sleutel %s in plaats an primaire sleutel %"
+"s\n"
 
-#: g10/getkey.c:2447
-#, fuzzy, c-format
+#: g10/getkey.c:2661
+#, c-format
 msgid "key %s: secret key without public key - skipped\n"
-msgstr ""
-"sleutel %08lX: geheime sleutel zonder openbare sleutel - overgeslagen\n"
+msgstr "sleutel %s: geheime sleutel zonder publiek deel - overgeslagen\n"
 
-#: g10/gpgv.c:68
+#: g10/gpgv.c:73
 msgid "be somewhat more quiet"
-msgstr "iets stiller zijn"
+msgstr "iets minder langdradig"
 
-#: g10/gpgv.c:69
+#: g10/gpgv.c:74
 msgid "take the keys from this keyring"
-msgstr "de sleutels uit deze sleutelbos nemen"
+msgstr "gebruik de sleutels van deze sleutelring"
 
-#: g10/gpgv.c:71
+#: g10/gpgv.c:76
 msgid "make timestamp conflicts only a warning"
-msgstr "geeft alleen waarschuwing bij tijdsstempel conflicten"
+msgstr "reduceer tijdmarkerings conflicten tot een waarschuwing"
 
-#: g10/gpgv.c:72
+#: g10/gpgv.c:77
 msgid "|FD|write status info to this FD"
-msgstr ""
+msgstr "|FD|schrijf status gegevens van deze FD"
 
-#: g10/gpgv.c:96
+#: g10/gpgv.c:101
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Gebruik: gpgv [opties] [bestanden] (-h voor hulp)"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:104
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
-"Syntaxis: gpg [opties] [bestanden]\n"
-"Ondertekeningen controleren met bekende, vertrouwde sleutels\n"
+"Gebruik: gpg [opties] [bestanden]\n"
+"Controleer ondertekeningen met vertrouwde sleutels\n"
 
-#: g10/helptext.c:48
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
 "to do with the (implicitly created) web-of-certificates."
 msgstr ""
-"Het is aan u om hier een waarde toe te wijzen; deze waarde wordt nooit\n"
-"uitgevoerd naar een derde partij.  We hebben het nodig om een web\n"
-"van vertrouwen te maken; het heeft niets te maken met het (impliciet\n"
-"gemaakte) web van certificaten."
+"Het is niet verplicht hier een waarde in te vullen; ook zal deze waarde "
+"niet\n"
+"worden geexporteerd. Het is nodig voor het netwerk-van-vertrouwen (web-of-"
+"trust)\n"
+"en heeft niets van doen met het netwerk-van-certificaten (web-of-"
+"certificates)."
 
-#: g10/helptext.c:54
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
 "access to the secret key.  Answer \"yes\" to set this key to\n"
 "ultimately trusted\n"
 msgstr ""
-"Om een Web van Vertrouwen te bouwen, moet GnuPG weten welke\n"
-"sleutels maximaal vertrouwd moeten worden - dit zijn meestal de\n"
-"sleutels waarvan u toegang heeft tot de geheime sleutel.  Antwoord\n"
-"\"ja\" om deze sleutel in te stellen als maximaal vertrouwd\n"
+"Om het netwerk-van-vertrouwen op te bouwen moet GnuPG weten welke sleutels\n"
+"U volledig vertrouwd. Dit zijn normaalgesproken de sleutels waarvoor u ook\n"
+"toegang heeft tot het geheime deel. Antwoord dan Yes op de vraag of deze "
+"sleutel\n"
+"volledig wordt vertrouwd.\n"
 
-#: g10/helptext.c:61
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
-"Antwoord \"ja\" als u toch deze niet-vertrouwde sleutel wilt gebruiken."
+"Als u deze niet vertrouwde sleutel toch wilt gebruiken antwoord dan “yes”."
 
-#: g10/helptext.c:65
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
-msgstr ""
-"Geef de gebruikerscode van de geadresseerde aan wie u het bericht wilt "
-"sturen."
+msgstr "Voer het gebruikers ID in van de ontvanger van dit bericht."
 
-#: g10/helptext.c:69
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1762,54 +1963,64 @@ msgid ""
 "\n"
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
+"Selecteer het te gebruiken algoritme.\n"
+"\n"
+"DSA (ook bekend als DSS) is het 'Digital Signature Algorithm' en kan alleen\n"
+"gebruikt worden voor ondertekeningen.\n"
+"\n"
+"Elgamal kan alleen gebruikt worden voor versleuteling.\n"
+"\n"
+"RSA kan gebruikt worden voor ondertekeningen en versleuteling.\n"
+"\n"
+"De eerste (primaire) sleutel moet altijd gebruikt kunnen worden voor "
+"ondertekeningen."
 
-#: g10/helptext.c:83
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
 "Please consult your security expert first."
 msgstr ""
-"In het algemeen is het geen goed idee om dezelfde sleutel te gebruiken\n"
-"voor ondertekenen en coderen.  Dit algoritme moet alleen in bepaalde\n"
-"domeinen worden gebruikt.\n"
-"Neem alstublieft eerst contact op met uw veiligheidsexpert."
+"Normaalgesproken is het goed om de zelfde sleutel te gebruiken voor\n"
+"ondertekeningen en versleuteling. Dit algoritme zou alleen gebruikt mogen\n"
+"worden in speciale gebieden. Vraag een beveiligingsspecialist voor advies."
 
-#: g10/helptext.c:90
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
-msgstr "Geef de grootte van de sleutel"
+msgstr "Geef de lengte van de sleutel"
 
-#: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143
-#: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
-msgstr "Beantwoord \"ja\" of \"nee\""
+msgstr "Antwoord “yes” (Ja) fo “no” (nee)"
 
-#: g10/helptext.c:104
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
 "get a good error response - instead the system tries to interpret\n"
 "the given value as an interval."
 msgstr ""
-"Geef de vereiste waarde zoals weergegeven in de opdrachtregel.\n"
-"Het is mogelijk om een ISO-datum (JJJJ-MM-DD) in te geven, maar\n"
-"u zal geen goede foutrespons krijgen - in plaats daarvan zal het\n"
-"systeem de gegeven waarde proberen te interpreteren als een\n"
-"interval."
+"Geef de vereiste waarde zoals getoont in de vraag.\n"
+"Het is mogelijk een ISO datum (JJJJ-MM-DD) maar u zal een onduidelijke \n"
+"foutmelding krijgen - het systeem zal dit proberen te interpreteren als\n"
+"een periode."
 
-#: g10/helptext.c:116
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Geef de naam van de sleutelhouder"
 
-#: g10/helptext.c:121
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
-"geef alstublieft een niet-verplichte maar sterk aangeraden e-mail adres"
+"geef alstublieft een emailadres, dit is niet verplicht maar wel sterk "
+"aangeraden"
 
-#: g10/helptext.c:125
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
-msgstr "Geef alstublieft een niet-verplichte opmerking"
+msgstr "Geef een optioneel commentaar"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1817,18 +2028,18 @@ msgid ""
 "O  to continue with key generation.\n"
 "Q  to to quit the key generation."
 msgstr ""
-"N  om de naam te wijzigen.\n"
-"C  om de opmerking te wijzigen.\n"
-"E  om het e-mail adres te wijzigen.\n"
-"O  om door te gaan met de aanmaak van de sleutel.\n"
-"Q  om te stoppen met de aanmaak van de sleutel."
+"N  verander de naam.\n"
+"C  verander het commentaar.\n"
+"E  verander het emailadres.\n"
+"O  doorgaan met het aanmaken van de sleutel.\n"
+"Q  om het aanmaken van de sleutel af te breken."
 
-#: g10/helptext.c:139
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
-"Beantwoord \"ja\" (of \"j\") als het goed is om een deelsleutel aan te maken."
+"Antwoord “yes” (of alleen “y”) als het goed is om de sub-sleutel te maken."
 
-#: g10/helptext.c:147
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -1868,95 +2079,87 @@ msgid ""
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
-"Als u een gebruikerscode op een sleutel ondertekend, is het eerst nodig\n"
-"dat u controleert dat de sleutel is van de persoon die genoemd wordt in\n"
-"de gebruikerscode.  Het is nuttig voor anderen om precies te weten hoe\n"
-"nauwkeurig u dit gedaan heeft.\n"
+"Als U tekend met een gebruikers ID voor een sleutel, moet U zich er "
+"terdegen\n"
+"van overtuigen dat deze sleutel is van degene in de naam. Voor anderen is\n"
+"het van belang hoe zeker U van Uw zaak bent.\n"
 "\n"
-"\"0\" betekent dat u niets beweert over u precies u de sleutel geverifieerd\n"
-"....heeft.\n"
+"“0” betekend dat U geen uitspraak maakt over hoe goed U deze sleutel\n"
+"    heeft gecontroleerd\n"
 "\n"
-"\"1\" betekent dat u gelooft dat de sleutel is van de persoon die beweert "
-"de\n"
-"    eigenaar te zijn, maar dat u de sleutel helemaal niet geverifieerd "
-"heeft\n"
-"    Dit is nuttig voor een \"persona\" verificatie, waar u de sleutel van "
-"een\n"
-"    pseudonieme gebruiker ondertekent.\n"
+"“1” betekend dat U denkt dat deze sleutel van de persson in het naam veld,\n"
+"    maar dat U dit niet kan of heeft gecontroleerd. Dit kan handig zijn "
+"voor\n"
+"    een “entiteit” controle, u tekend bijvoorbeeld voor een pseudoniem.\n"
 "\n"
-"\"2\" betekent dat u de sleutel een beetje geverifieerd heeft.  "
-"Bijvoorbeeld\n"
-"    door de vingerafdruk van de sleutel te controleren en de gebruikerscode\n"
-"    t.o.v. een foto ID te vergelijken.\n"
+"“2” betekend dat U enigzinds heeft gecontroleerd dat de identiteit van de\n"
+"    persoon klopt doormiddel van de vingerafdruk en de code van de Foto met\n"
+"    de Gebruikers ID.\n"
 "\n"
-"\"3\" betekent dat u een uitgebreide verificatie van de sleutel heeft "
-"gedaan.\n"
-"    Bijvoorbeeld door de vingerafdruk van de sleutel in persoon te "
-"verifiëren\n"
-"    met de eigenaar van de sleutel, door de naam van de sleutel eigenaar\n"
-"    vast te stellen aan de hand van een betrouwbaar document met foto\n"
-"    (zoals een paspoort), en door met het versturen van e-mail te "
-"controleren\n"
-"    dat het e-mail adres van de sleutel eigenaar is.\n"
+"“3” betekend dat u de sleutel en zijn eigenaar goed heeft gecontroleerd\n"
+"    bijvoorbeeld dat U de digitale Vingerafdruk persoonlijk van die persoon\n"
+"    heeft gekregen, en dat u met behulp van een moeilijk na te maken\n"
+"    document met een foto (bijvoorbeeld een paspoort) heeft gecontroleerd\n"
+"    dat de naam klopt met de naam in de sleutel. En dat het opgegeven email\n"
+"    adres ook klopt met deze persoon (bijvoorbeeld door email heen en weer\n"
+"    te sturen).\n"
 "\n"
-"Let op dat de voorbeelden bij niveau 2 en 3 *alleen* voorbeelden zijn.\n"
-"Het is uiteindelijk aan u om te besluiten wat \"een beetje\" en \"uitgebreid"
-"\"\n"
-"voor u betekent bij het ondertekenen van sleutels.\n"
+"Houd er rekening mee dat de voorbeelden hierboven slecht voorbeelden zijn.\n"
+"Uiteindelijk moet U zelf besluiten wat 'een beetje' (casual) en "
+"'uitgebreid'\n"
+"(Extensive) voor U betekenen.\n"
 "\n"
-"Als u niet weet wat te antwoorden, kunt u \"0\" antwoorden."
+"In geval van twijfel over deze keuze, kies dan “0”."
 
-#: g10/helptext.c:185
-#, fuzzy
+#: g10/helptext.c:186
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr "Antwoord \"ja\" als u ALLE gebruikerscodes wilt ondertekenen"
+msgstr "Antwoord “yes” als U alle gebruikers ID wilt tekenen."
 
-#: g10/helptext.c:189
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
 msgstr ""
-"Antwoord \"ja\" als u echt deze gebruikerscode wilt verwijderen.\n"
-"Alle certificaten zullen ook verloren gaan!"
+"Antwoord “yes” als U werkelijk deze Gebruiker ID wilt wissen.\n"
+"Alle bijbehorende certificaten worden ook gewist!"
 
-#: g10/helptext.c:194
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "Antwoord \"ja\" als het goed is om de deelsleutel te verwijderen"
+msgstr "Antwoord “yes” als U de sub-sleutel wilt wissen"
 
-#: g10/helptext.c:199
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
 "trust connection to the key or another key certified by this key."
 msgstr ""
-"Dit is een geldige ondertekening op de sleutel; normaal\n"
-"gesproken wilt u deze ondertekening niet verwijderen omdat\n"
-"deze belangrijk kan zijn in het tot stand brengen van een\n"
-"vertrouwensverbinding met de sleutel of een andere sleutel\n"
-"die gecertificeerd wordt met deze sleutel."
+"Dit is een geldige ondertekening aan deze sleutel; normaal wilt U deze\n"
+"ondertekening niet wissen omdat het belangrijk kan zijn in het bepalen\n"
+"van het vertrouwen in deze sleutel ten opzichte van een andere sleutel\n"
+"met een ondertekening van deze sleutel."
 
-#: g10/helptext.c:204
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
 "know which key was used because this signing key might establish\n"
 "a trust connection through another already certified key."
 msgstr ""
-"De ondertekening kan niet worden gecontroleerd omdat u de\n"
-"geassocieerde sleutel niet heeft.  U kunt beter wachten met de\n"
-"verwijdering totdat u weet welke sleutel gebruikt is, omdat deze\n"
-"ondertekensleutel mogelijk een vetrouwensverbinding tot stand\n"
-"brengt via een andere gecertificeerde sleutel."
+"Deze ondertekening kan niet worden gecontroleerd omdat er geen bijbehorende\n"
+"publieke sleutel beschikbaar is. U wordt aangeraden het verwijderen van de\n"
+"sleutel uit te stellen. Het kan zijn dat deze sleutel een verbinding maakt\n"
+"met een sleutel van een reeds gecertificeerde sleutel."
 
-#: g10/helptext.c:210
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr ""
-"De ondertekening is niet geldig.  Het is logisch deze te verwijderen\n"
-"uit uw sleutelbos."
+"De ondertekening is niet geldig. Het is een goed idee deze van uw "
+"sleutelring\n"
+"af te halen."
 
-#: g10/helptext.c:214
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -1964,50 +2167,49 @@ msgid ""
 "only if this self-signature is for some reason not valid and\n"
 "a second one is available."
 msgstr ""
-"Dit is een ondertekening die de gebruikerscode aan de sleutel bindt.\n"
-"Het is meestal geen goed idee om zo'n ondertekening te verwijderen.\n"
-"GnuPG kan zelfs niet meer in staat zijn om deze sleutel te gebruiken.\n"
-"Doe dit dus alleen als deze zelfondertekening om de een of andere\n"
-"reden niet geldig is en er een tweede beschikbaar is."
+"Dit is een ondertekening die de Gebruikers ID aan de sleutel koppeld. Het\n"
+"wordt niet aangeraden deze ondertekening te verwijderen. Waarschijnlijk zal\n"
+"GnuPG deze sleutel niet meer kunnen gebruiken. Doe dit alleen als dit een\n"
+"zelf gezette ondertekening is die fout is gegaan en dat er een andere\n"
+"beschikbaar is."
 
-#: g10/helptext.c:222
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures will be advanced by one second.\n"
 msgstr ""
-"De voorkeuren van alle gebruikerscodes (of alleen bepaalde) veranderen\n"
-"naar de huidige lijst van voorkeuren.  De tijdsstempel van alle betrokken\n"
-"zelfondertekeningen worden verhoogt met een seconde.\n"
+"Vervang de eigenschappen van alle (of allen de gekozen) Gebruikers ID's\n"
+"met de opgegeven eigenschappen. De tijd indicatie van alle betrokken\n"
+"ondertekeningen zal met een seconde worden opgehoogd.\n"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "Geef alstublieft het wachtwoord; dit is een geheime zin \n"
+msgstr ""
+"Geef een geheime zin (passphrase); deze zin gebruikt U om de sleutel\n"
+"te beschermen\n"
 
-#: g10/helptext.c:235
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr ""
-"Herhaal alstublieft het laatste wachtwoord, zodat u zeker weet wat u heeft "
-"ingevoerd."
+msgstr "Herhaal de geheime zin, om zeker te zijn dat deze juist is."
 
-#: g10/helptext.c:239
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
-msgstr ""
-"Geef de naam van het bestand waarvoor de ondertekening van toepassing is"
+msgstr "Geef de naam van het bestaand waar deze ondertekening van is"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "Antwoord \"ja\" als het goed is om het bestand te overschrijven"
+msgstr "Antwoord “yes” als het bestand overschreven moet worden"
 
-#: g10/helptext.c:249
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
 msgstr ""
-"Geef alstublieft een nieuwe bestandsnaam. Als u alleen op enter\n"
-"drukt wordt het (weergegeven) standaardbestand gebruikt."
+"Geef alstublieft een nieuwe bestandsnaam. Als U op Enter drukt zal de\n"
+"standaardnaam (tussen de blokhaken) gebruikt worden."
 
-#: g10/helptext.c:255
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2022,1757 +2224,1774 @@ msgid ""
 "      Use this to state that the user ID should not longer be used;\n"
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
-"Het is nodig om een reden voor de certificatie op te geven.  Afhankelijk "
-"van\n"
-"van context kunt u uit de volgende lijst kiezen:\n"
-"  \"Sleutel is in gevaar gebracht\"\n"
-"      Gebruik dit als u een reden heeft om te geloven dat personen toegang\n"
-"      tot uw geheime sleutel hebben gekregen die dat niet mochten hebben.\n"
-"  \"Sleutel is achterhaald\"\n"
-"      Gebruik dit als u deze sleutel heeft vervangen door een nieuwere.\n"
-"  \"Sleutel wordt niet meer gebruikt\"\n"
-"      Gebruik dit als u deze sleutel niet meer gebruikt.\n"
-"  \"Gebruikerscode is niet meer geldig\"\n"
-"      Gebruik dit om aan te geven dat de gebruikerscode niet langer moet\n"
-"      worden gebruikt; meestal wordt dit gebruikt om aan te geven dat een\n"
-"      e-mail adres niet meer geldig is.\n"
-
-#: g10/helptext.c:271
+"Geef hier de reden voor de certificering. Afhankelijk van de reden kan U\n"
+"een omschrijving kiezen uit deze lijst:\n"
+"  “Key has been compromised”\n"
+"      Als Uw Geheime Sleutel in handen is gekomen van derden.\n"
+"  “Key is superseded”\n"
+"      Als U een vervangende Sleutel heeft gemaakt.\n"
+"  “Key is no longer used”\n"
+"      Als U deze sleutel niet meer gebruikt.\n"
+"  “User ID is no longer valid”\n"
+"      Als de Gebruikers ID niet meer klopt;\n"
+"      Normaalgesproken als het email adres niet meer klopt.\n"
+
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
-"Als u dat wilt, kunt u een tekst invoeren die beschrijft waarom\n"
-"u dit herroepingscertificaat uitgeeft.  Hou de tekst a.u.b. kort.\n"
-"Een lege regel eindigt de tekst.\n"
+"Als U wilt kunt U hier een uitleg geven waarom dat u dit intrekkings-\n"
+"certificaat maakt. Gebruik een bondige omschrijving, liefst in de taal\n"
+"gangbaar in de groep waar u het meeste communiceerd.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Geen hulp beschikbaar"
 
-#: g10/helptext.c:294
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
-msgstr "Geen hulp beschikbaar voor `%s'"
+msgstr "Geen hulp beschikbaar voor ‘%s’"
+
+#: g10/import.c:96
+msgid "import signatures that are marked as local-only"
+msgstr "belangrijke ondertekeningen die als lokaal zijn gemarkeerd"
 
-#: g10/import.c:247
+#: g10/import.c:98
+msgid "repair damage from the pks keyserver during import"
+msgstr "herstel schade van de publieke sleutels tijdens importeren"
+
+#: g10/import.c:100
+msgid "do not update the trustdb after import"
+msgstr "verketer de vertrouwenslijst niet na importeren"
+
+#: g10/import.c:102
+msgid "create a public key when importing a secret key"
+msgstr "maak een publieke sleutel bij het importeren van een geheime sleutel"
+
+#: g10/import.c:104
+msgid "only accept updates to existing keys"
+msgstr "accepteer alleen vernieuwingen van aanwezige sleutels"
+
+#: g10/import.c:106
+msgid "remove unusable parts from key after import"
+msgstr "verwijder onbruikbare delen van de sleutel na importeren"
+
+#: g10/import.c:108
+msgid "remove as much as possible from key after import"
+msgstr "verwijder zo veel mogelijk van de sleutel na importeren"
+
+#: g10/import.c:267
 #, c-format
 msgid "skipping block of type %d\n"
-msgstr "blok van soort %d wordt overgeslagen\n"
+msgstr "blok van het type %d overgeslagen\n"
 
-#: g10/import.c:256
-#, fuzzy, c-format
+#: g10/import.c:276
+#, c-format
 msgid "%lu keys processed so far\n"
-msgstr "tot nu toe %lu sleutels verwerkt\n"
+msgstr "%lu sleutels tot zo ver verwerkt\n"
 
-#: g10/import.c:273
+#: g10/import.c:293
 #, c-format
 msgid "Total number processed: %lu\n"
-msgstr "Totale aantal verwerkt: %lu\n"
+msgstr "       Totaal aantal verwerkt: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:295
 #, c-format
 msgid "      skipped new keys: %lu\n"
-msgstr "      overgeslagen nieuwe sleutels: %lu\n"
+msgstr " Overgeslagen nieuwe sleutels: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:298
 #, c-format
 msgid "          w/o user IDs: %lu\n"
-msgstr "          zonder gebruikerscode: %lu\n"
+msgstr "         Zonder Gebruikers ID: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:300
 #, c-format
 msgid "              imported: %lu"
-msgstr "              ingevoerd: %lu"
+msgstr "                 Geimporteerd: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:306
 #, c-format
 msgid "             unchanged: %lu\n"
-msgstr "             ongewijzigd: %lu\n"
+msgstr "                  Onveranderd: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:308
 #, c-format
 msgid "          new user IDs: %lu\n"
-msgstr "          nieuwe gebruikerscodes: %lu\n"
+msgstr "        Nieuwe Gebruiker ID's: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:310
 #, c-format
 msgid "           new subkeys: %lu\n"
-msgstr "           nieuwe deelsleutels: %lu\n"
+msgstr "          Nieuwe Sub-Sleutels: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:312
 #, c-format
 msgid "        new signatures: %lu\n"
-msgstr "        nieuwe ondertekeningen: %lu\n"
+msgstr "        Nieuwe Handtekeningen: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:314
 #, c-format
 msgid "   new key revocations: %lu\n"
-msgstr "   nieuwe sleutelherroepingen: %lu\n"
+msgstr "  Nieuwe Sleutel intrekkingen: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:316
 #, c-format
 msgid "      secret keys read: %lu\n"
-msgstr "      gelezen geheime sleutels: %lu\n"
+msgstr "     Geheime sleutels gelezen: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:318
 #, c-format
 msgid "  secret keys imported: %lu\n"
-msgstr "  ingevoerde geheime sleutels: %lu\n"
+msgstr "Geheime sleutels geimporteerd: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:320
 #, c-format
 msgid " secret keys unchanged: %lu\n"
-msgstr " ongewijzigde geheime sleutels: %lu\n"
+msgstr " Geheime sleutels onveranderd: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:322
 #, c-format
 msgid "          not imported: %lu\n"
-msgstr "          niet ingevoerd: %lu\n"
+msgstr "            Niet geimporteerd: %lu\n"
+
+#: g10/import.c:324
+#, c-format
+msgid "    signatures cleaned: %lu\n"
+msgstr "   Handtekeningen opgeschoont: %lu\n"
+
+#: g10/import.c:326
+#, c-format
+msgid "      user IDs cleaned: %lu\n"
+msgstr "   Gebruiker ID's opgeschoond: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:567
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
-msgstr ""
+msgstr "Waarschuwing: sleutels %s bevat voorkeuren voor onbeschikbaar\n"
 
-#: g10/import.c:545
-#, fuzzy
-msgid "algorithms on these user IDs:\n"
-msgstr "U heeft deze gebruikerscodes ondertekend:\n"
+#. TRANSLATORS: This string is belongs to the previous one.  They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:571
+msgid "         algorithms on these user IDs:\n"
+msgstr "         algoritmen op deze Gebruiker ID's:\n"
 
-#: g10/import.c:582
+#: g10/import.c:608
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
-msgstr ""
+msgstr "         “%s”: voorkeur voor versleutelalgoritme %s\n"
 
-#: g10/import.c:594
-#, fuzzy, c-format
+#: g10/import.c:620
+#, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
-msgstr "%s ondertekeing, digest-algoritme %s\n"
+msgstr "         “%s”: voorkeur voor samenvattings algoritme %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:632
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
-msgstr ""
+msgstr "         “%s”: voorkeur voor compressie algoritme %s\n"
 
-#: g10/import.c:619
+#: g10/import.c:645
 msgid "it is strongly suggested that you update your preferences and\n"
-msgstr ""
+msgstr "het wordt sterk aangeraden Uw voorkeuren aan te passen en\n"
 
-#: g10/import.c:621
+#: g10/import.c:647
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
+"deze sleutel opnieuw te distribueren om een potentieel algoritme conflict te "
+"voorkomen\n"
 
-#: g10/import.c:645
+#: g10/import.c:671
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
-msgstr ""
+msgstr "Uw voorkeuren verbeteren met: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:693 g10/import.c:1047
-#, fuzzy, c-format
+#: g10/import.c:721 g10/import.c:1119
+#, c-format
 msgid "key %s: no user ID\n"
-msgstr "sleutel %08lX: gebruikerscode niet gevonden\n"
+msgstr "sleutel %s: geen Gebruiker ID\n"
 
-#: g10/import.c:713
-#, fuzzy, c-format
+#: g10/import.c:750
+#, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
-msgstr "sleutel %08lX: HKP-deelsleutel beschadiging gerepareerd\n"
+msgstr "sleutel %s: PKS sub-sleutel fouten verbeterd\n"
 
-#: g10/import.c:728
-#, fuzzy, c-format
+#: g10/import.c:765
+#, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
-msgstr ""
-"sleutel %08lX: niet-zelfondertekende gebruikerscode '%s' geaccepteerd\n"
+msgstr "sleutel %s: heeft een niet zelf-getekende Gebruikers ID “%s”\n"
 
-#: g10/import.c:734
-#, fuzzy, c-format
+#: g10/import.c:771
+#, c-format
 msgid "key %s: no valid user IDs\n"
-msgstr "sleutel %08lX: geen geldige gebruikerscodes\n"
+msgstr "sleutel %s: geen geldige Gebruiker ID(s)\n"
 
-#: g10/import.c:736
+#: g10/import.c:773
 msgid "this may be caused by a missing self-signature\n"
-msgstr "dit is mogelijk veroorzaakt door een ontbrekende zelfondertekening\n"
+msgstr "dit kan komen doordat de zelf-ondertekening mist\n"
 
-#: g10/import.c:746 g10/import.c:1168
-#, fuzzy, c-format
+#: g10/import.c:783 g10/import.c:1241
+#, c-format
 msgid "key %s: public key not found: %s\n"
-msgstr "sleutel %08lX: openbare sleutel niet gevonden: %s\n"
+msgstr "sleutel %s: publieke sleutel niet gevonden: %s\n"
 
-#: g10/import.c:752
-#, fuzzy, c-format
+#: g10/import.c:789
+#, c-format
 msgid "key %s: new key - skipped\n"
-msgstr "sleutel %08lX: nieuwe sleutel - overgeslagen\n"
+msgstr "sleutel %s: nieuwe sleutel - overgeslagen\n"
 
-#: g10/import.c:761
+#: g10/import.c:798
 #, c-format
 msgid "no writable keyring found: %s\n"
-msgstr "geen schrijfbare sleutelbos gevonden: %s\n"
+msgstr "geen schrijfbaar sleutelringbestand: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
 #, c-format
 msgid "writing to `%s'\n"
-msgstr "bezig met schrijven naar `%s'\n"
+msgstr "schrijven naar ‘%s’\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
+#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
+#: g10/import.c:2364 g10/import.c:2386
 #, c-format
 msgid "error writing keyring `%s': %s\n"
-msgstr "fout bij schrijven sleutelbos `%s': %s\n"
+msgstr "fout bij het schrijven naar sleutelring ‘%s’: %s\n"
 
-#: g10/import.c:791
-#, fuzzy, c-format
+#: g10/import.c:826
+#, c-format
 msgid "key %s: public key \"%s\" imported\n"
-msgstr "sleutel %08lX: openbare sleutel \"%s\" geïmporteerd\n"
+msgstr "sleutel %s: publieke sleutel “%s” geimporteerd\n"
 
-#: g10/import.c:815
-#, fuzzy, c-format
+#: g10/import.c:850
+#, c-format
 msgid "key %s: doesn't match our copy\n"
-msgstr "sleutel %08lX: komt niet overeen met onze versie\n"
+msgstr "sleutel %s: klopt niet met onze kopie\n"
 
-#: g10/import.c:832 g10/import.c:1186
-#, fuzzy, c-format
+#: g10/import.c:867 g10/import.c:1259
+#, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "sleutel %08lX: kan oorspronkelijk sleutelblok niet vinden: %s\n"
+msgstr "sleutel %s: kan het orginele sleutelblok niet vinden: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
-#, fuzzy, c-format
+#: g10/import.c:875 g10/import.c:1266
+#, c-format
 msgid "key %s: can't read original keyblock: %s\n"
-msgstr "sleutel %08lX: kan oorspronkelijk sleutelblok niet lezen: %s\n"
+msgstr "sleutel %s: kan het orginele sleutelblok niet lezen: %s\n"
 
-#: g10/import.c:872
-#, fuzzy, c-format
+#: g10/import.c:912
+#, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
-msgstr "sleutel %08lX: \"%s\" 1 nieuwe gebruikerscode\n"
+msgstr "sleutel %s: “%s” 1 nieuwe gebruikers ID\n"
 
-#: g10/import.c:875
-#, fuzzy, c-format
+#: g10/import.c:915
+#, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
-msgstr "sleutel %08lX: \"%s\" %d nieuwe gebruikerscodes\n"
+msgstr "sleutel %s: “%s” %d nieuwe gebruikers ID's\n"
 
-#: g10/import.c:878
-#, fuzzy, c-format
+#: g10/import.c:918
+#, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
-msgstr "sleutel %08lX: \"%s\" 1 nieuwe ondertekening\n"
+msgstr "sleutel %s: “%s” 1 nieuwe ondertekening\n"
 
-#: g10/import.c:881
-#, fuzzy, c-format
+#: g10/import.c:921
+#, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
-msgstr "sleutel %08lX: \"%s\" %d nieuwe ondertekeningen\n"
+msgstr "sleutel %s: “%s” %d nieuwe ondertekeningen\n"
 
-#: g10/import.c:884
-#, fuzzy, c-format
+#: g10/import.c:924
+#, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
-msgstr "sleutel %08lX: \"%s\" 1 nieuwe deelsleutel\n"
+msgstr "sleutel %s: “%s” 1 nieuwe sub-sleutel\n"
 
-#: g10/import.c:887
-#, fuzzy, c-format
+#: g10/import.c:927
+#, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
-msgstr "sleutel %08lX: \"%s\" %d nieuwe deelsleutels\n"
+msgstr "sleutel %s: “%s” %d nieuwe sub-sleutels\n"
+
+#: g10/import.c:930
+#, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "sleutel %s: “%s” %d ondertekening opgeschoond\n"
+
+#: g10/import.c:933
+#, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "sleutel %s: “%s” %d ondertekeningen opgeschoond\n"
+
+#: g10/import.c:936
+#, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "sleutel %s: “%s” %d gebruiker ID opgeschoond\n"
 
-#: g10/import.c:908
-#, fuzzy, c-format
+#: g10/import.c:939
+#, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "sleutel %s: “%s” %d gebruiker ID's opgeschoond\n"
+
+#: g10/import.c:962
+#, c-format
 msgid "key %s: \"%s\" not changed\n"
-msgstr "sleutel %08lX: \"%s\" niet gewijzigd\n"
+msgstr "sleutel %s: “%s” niet veranderd\n"
 
-#: g10/import.c:1053
-#, fuzzy, c-format
+#: g10/import.c:1125
+#, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
-"sleutel %08lX: geheime sleutel met ongeldige codering %d - overgeslagen\n"
+"sleutel %s: geheime sleutel met ongeldig versleutelalgoritme %d -\n"
+"overgeslagen\n"
 
-#: g10/import.c:1064
-#, fuzzy
+#: g10/import.c:1136
 msgid "importing secret keys not allowed\n"
-msgstr "bezig met schrijven geheime sleutel naar `%s'\n"
+msgstr "importeren van geheime sleutels is niet toegestaan\n"
 
-#: g10/import.c:1081
+#: g10/import.c:1153 g10/import.c:2379
 #, c-format
 msgid "no default secret keyring: %s\n"
-msgstr "geen standaard geheime sleutelbos: %s\n"
+msgstr "geen standaard geheim sleutelringbestand: %s\n"
 
-#: g10/import.c:1092
-#, fuzzy, c-format
+#: g10/import.c:1164
+#, c-format
 msgid "key %s: secret key imported\n"
-msgstr "sleutel %08lX: geheime sleutel geïmporteerd\n"
+msgstr "sleutel %s: geheime sleutel geimporteerd\n"
 
-#: g10/import.c:1121
-#, fuzzy, c-format
+#: g10/import.c:1194
+#, c-format
 msgid "key %s: already in secret keyring\n"
-msgstr "sleutel %08lX: al in geheime sleutelbos\n"
+msgstr "sleutel %s: reeds aanwezige geheime sleutel\n"
 
-#: g10/import.c:1131
-#, fuzzy, c-format
+#: g10/import.c:1204
+#, c-format
 msgid "key %s: secret key not found: %s\n"
-msgstr "sleutel %08lX: geheime sleutel niet gevonden: %s\n"
+msgstr "sleutel %s: geheime sleutel niet gevonden: %s\n"
 
-#: g10/import.c:1161
-#, fuzzy, c-format
+#: g10/import.c:1234
+#, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
-"sleutel %08lX: geen openbare sleutel - kan herroepingscertificaat niet "
+"sleutel %s: geen publieke sleutel - kan intrekkingscertificaat niet "
 "toepassen\n"
 
-#: g10/import.c:1204
-#, fuzzy, c-format
+#: g10/import.c:1277
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
-msgstr "sleutel %08lX: ongeldig herroepingscertificaat: %s - verworpen\n"
+msgstr "sleutel %s: ongeldig intrekkingscertificaat: %s - afgewezen\n"
 
-#: g10/import.c:1236
-#, fuzzy, c-format
+#: g10/import.c:1309
+#, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
-msgstr "sleutel %08lX: \"%s\" herroepingscertificaat geïmporteerd\n"
+msgstr "sleutel %s: “%s” intrekkingscertificaat geimporteerd\n"
 
-#: g10/import.c:1301
-#, fuzzy, c-format
+#: g10/import.c:1375
+#, c-format
 msgid "key %s: no user ID for signature\n"
-msgstr "sleutel %08lX: geen gebruikerscode voor ondertekening\n"
+msgstr "sleutel %s: geen Gebruikers ID voor ondertekening\n"
 
-#: g10/import.c:1316
-#, fuzzy, c-format
+#: g10/import.c:1390
+#, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
-"sleutel %08lX: niet-ondersteund openbare sleutel algoritme bij "
-"gebruikerscode \"%s\"\n"
+"sleutel %s: niet ondersteund publieke sleutel algoritme bij Gebruiker ID “%"
+"s”\n"
 
-#: g10/import.c:1318
-#, fuzzy, c-format
+#: g10/import.c:1392
+#, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
-msgstr "sleutel %08lX: ongeldige zelfondertekening bij gebruikerscode \"%s\"\n"
+msgstr "sleutel %s: ongeldige zelf-ondertekening bij Gebruiker ID “%s”\n"
 
-#: g10/import.c:1336
-#, fuzzy, c-format
+#: g10/import.c:1410
+#, c-format
 msgid "key %s: no subkey for key binding\n"
-msgstr "sleutel %08lX: geen deelsleutel voor sleutelkoppeling\n"
+msgstr "sleutel %s: geen sub-sleutel voor sleutel binding\n"
 
-#: g10/import.c:1347 g10/import.c:1397
-#, fuzzy, c-format
+#: g10/import.c:1421 g10/import.c:1471
+#, c-format
 msgid "key %s: unsupported public key algorithm\n"
-msgstr "sleutel %08lX: niet-ondersteund openbare sleutel algoritme\n"
+msgstr "sleutel %s: niet ondersteund publieke sleutel algoritme\n"
 
-#: g10/import.c:1349
-#, fuzzy, c-format
+#: g10/import.c:1423
+#, c-format
 msgid "key %s: invalid subkey binding\n"
-msgstr "sleutel %08lX: ongeldige deelsleutelkoppeling\n"
+msgstr "sleutel %s: ongeldige sub-sleutel binding\n"
 
-#: g10/import.c:1364
-#, fuzzy, c-format
+#: g10/import.c:1438
+#, c-format
 msgid "key %s: removed multiple subkey binding\n"
-msgstr "sleutel %08lX: meervoudige deelsleutelkoppeling verwijderd\n"
+msgstr "sleutel %s: dubbele sub-sleutel binding verwijderd\n"
 
-#: g10/import.c:1386
-#, fuzzy, c-format
+#: g10/import.c:1460
+#, c-format
 msgid "key %s: no subkey for key revocation\n"
-msgstr "sleutel %08lX: geen deelsleutel voor sleutelherroeping\n"
+msgstr "sleutel %s: geen sub-sleutel bij intrekking\n"
 
-#: g10/import.c:1399
-#, fuzzy, c-format
+#: g10/import.c:1473
+#, c-format
 msgid "key %s: invalid subkey revocation\n"
-msgstr "sleutel %08lX: ongeldige deelsleutel herroeping\n"
+msgstr "sleutel %s: ongeldige sub-sleutel intrekking\n"
 
-#: g10/import.c:1414
-#, fuzzy, c-format
+#: g10/import.c:1488
+#, c-format
 msgid "key %s: removed multiple subkey revocation\n"
-msgstr "sleutel %08lX: meervoudige deelsleutel herroeping verwijderd\n"
+msgstr "sleutel %s: dubbele sub-sleutel intrekkingen verwijderd\n"
 
-#: g10/import.c:1456
-#, fuzzy, c-format
+#: g10/import.c:1530
+#, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
-msgstr "sleutel %08lX: gebruikerscode overgeslagen '"
+msgstr "sleutel %s: overgeslagen Gebruiker ID “%s”\n"
 
-#: g10/import.c:1477
-#, fuzzy, c-format
+#: g10/import.c:1551
+#, c-format
 msgid "key %s: skipped subkey\n"
-msgstr "sleutel %08lX: deelsleutel overgeslagen\n"
+msgstr "sleutel %s: sub-sleutel overgeslagen\n"
 
-#: g10/import.c:1504
-#, fuzzy, c-format
+#: g10/import.c:1578
+#, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
-"sleutel %08lX: niet-uitvoerbare ondertekening (klasse %02x) - overgeslagen\n"
+"sleutel %s: niet exporteerbare ondertekening (klasse 0x%02X) - overgeslagen\n"
 
-#: g10/import.c:1514
-#, fuzzy, c-format
+#: g10/import.c:1588
+#, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
-msgstr ""
-"sleutel %08lX: herroepingscertificaat op verkeerde plek - overgeslagen\n"
+msgstr "sleutel %s: intrekkingscertificaat op verkeerde plek - overgeslagen\n"
 
-#: g10/import.c:1531
-#, fuzzy, c-format
+#: g10/import.c:1605
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
-msgstr "sleutel %08lX: ongeldig herroepingscertificaat: %s - overgeslagen\n"
+msgstr "sleutel %s: ongeldig intrekkingscertificaat: %s - overgeslagen\n"
 
-#: g10/import.c:1545
-#, fuzzy, c-format
+#: g10/import.c:1619
+#, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
-"sleutel %08lX: deelsleutel ondertekening op verkeerde plek - overgeslagen\n"
+"sleutel %s: sub-sleutel ondertekening op verkeerde plek - overgeslagen\n"
 
-#: g10/import.c:1553
-#, fuzzy, c-format
+#: g10/import.c:1627
+#, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
-msgstr ""
-"sleutel %08lX: onverwachte ondertekeningsklasse (0x%02X) - overgeslagen\n"
+msgstr "sleutel %s: onverwachte ondertekening klasse (0x%02X) - overgeslagen\n"
 
-#: g10/import.c:1653
-#, fuzzy, c-format
+#: g10/import.c:1727
+#, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
-msgstr "sleutel %08lX: dubbele gebruikerscode gevonden - samengevoegd\n"
+msgstr "sleutel %s: dubbele Gebruikers ID gevonden - samengevoegd\n"
 
-#: g10/import.c:1715
-#, fuzzy, c-format
+#: g10/import.c:1789
+#, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
-"WAARSCHUWING: sleutel %08lX kan herroepen zijn: herroepingssleutel %08lX "
-"wordt opgehaald\n"
+"Waarschuwing: sleutel %s kan ingetrokken zijn: ophalen intrekkingssleutel %"
+"s\n"
 
-#: g10/import.c:1729
-#, fuzzy, c-format
+#: g10/import.c:1803
+#, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
-"WAARSCHUWING: sleutel %08lX kan herroepen zijn: herroepingssleutel %08lX "
-"niet aanwezig.\n"
+"Waarschuwing: sleutel %s kan ingetrokken zijn: intrekkingssleutel %s niet "
+"aanwezig.\n"
 
-#: g10/import.c:1788
-#, fuzzy, c-format
+#: g10/import.c:1862
+#, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
-msgstr "sleutel %08lX: \"%s\" herroepingscertificaat toegevoegd\n"
+msgstr "sleutel %s: “%s” intrekkingscertificaat toegevoegd\n"
 
-#: g10/import.c:1822
-#, fuzzy, c-format
+#: g10/import.c:1896
+#, c-format
 msgid "key %s: direct key signature added\n"
-msgstr "sleutel %08lX: directe sleutelondertekening toegevoegd\n"
+msgstr "sleutel %s: directe sleutel ondertekening toegevoegd\n"
+
+#: g10/import.c:2285
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr "Noot: een serienummer van een sleutel klopt niet met de kaart\n"
+
+#: g10/import.c:2293
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "Noot: primaire sleutel is online en opgeslagen op de kaart\n"
 
-#: g10/keydb.c:167
+#: g10/import.c:2295
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "Noot: secondaire sleutel is online en opgeslagen op de kaart\n"
+
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
-msgstr "fout bij aanmaken sleutelbos `%s': %s\n"
+msgstr "fout bij het aanmaken van de sleutelring ‘%s’: %s\n"
 
-#: g10/keydb.c:174
+#: g10/keydb.c:175
 #, c-format
 msgid "keyring `%s' created\n"
-msgstr "sleutelbos `%s' aangemaakt\n"
+msgstr "sleutelring ‘%s’ is aangemaakt\n"
 
-#: g10/keydb.c:685
+#: g10/keydb.c:316 g10/keydb.c:319
+#, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "sleutelblok bronnen ‘%s’: %s\n"
+
+#: g10/keydb.c:698
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
-msgstr "opnieuw opbouwen sleutelbos buffer mislukt: %s\n"
+msgstr "het is mislukt om de cache van de sleutelring te herbouwen: %s\n"
 
-#: g10/keyedit.c:253
+#: g10/keyedit.c:266
 msgid "[revocation]"
-msgstr "[herroeping]"
+msgstr "[intrekking]"
 
-#: g10/keyedit.c:254
+#: g10/keyedit.c:267
 msgid "[self-signature]"
-msgstr "[zelfondertekening]"
+msgstr "[zelf-ondertekening]"
 
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:345 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 slechte ondertekening\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:347 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d slechte ondertekeningen\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:349 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
-msgstr "1 ondertekening niet gecontroleerd vanwege een ontbrekende sleutel\n"
+msgstr "1 ondertekening is niet gecontroleerd door missende sleutel(s)\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:348
+#: g10/keyedit.c:351 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
-msgstr "%d ondertekeningen niet gecontroleerd vanwege ontbrekende sleutels\n"
+msgstr "%d ondertekeningen zijn niet gecontroleerd door missende sleutel(s)\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:350
+#: g10/keyedit.c:353 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
-msgstr "1 ondertekening niet gecontroleerd vanwege een fout\n"
+msgstr "1 ondertekening is niet gecontroleerd door een fout\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:355 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
-msgstr "%d ondertekeningen niet gecontroleerd vanwege fouten\n"
+msgstr "%d ondertekeningen is niet gecontroleerd door een fout\n"
 
-#: g10/keyedit.c:344
+#: g10/keyedit.c:357
 msgid "1 user ID without valid self-signature detected\n"
-msgstr "1 gebruikerscode zonder geldige zelfondertekening gevonden\n"
+msgstr "1 gebruiker ID zonder zelf-handtekening gevonden\n"
 
-#: g10/keyedit.c:346
+#: g10/keyedit.c:359
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
-msgstr "%d gebruikerscodes zonder geldige zelfondertekening gevonden\n"
+msgstr "%d gebruiker ID's zonder zelf-handtekening gevonden\n"
 
-#: g10/keyedit.c:402 g10/pkclist.c:262
-#, fuzzy
+#: g10/keyedit.c:415 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
 "(by looking at passports, checking fingerprints from different sources, "
 "etc.)\n"
 msgstr ""
-"Besluit alstublieft in hoeverre u deze gebruiker erop\n"
-"vertrouwt om sleutels van andere gebruikers te\n"
-"controleren (door paspoorten te bekijken, vingerafdrukken\n"
-"te controleren van verschillende bronnen...).\n"
-"\n"
+"Geef aan hoe U er op vertrouwd dat deze persoon de sleutels op echtheid\n"
+"heeft gecontroleerd\n"
+"(Bijvoorbeeld heeft deze persoon paspoorten gecontroleerd of "
+"vingerafdrukken\n"
+" van verschillende bronnen vergeleken.)\n"
 
-#: g10/keyedit.c:406 g10/pkclist.c:274
-#, fuzzy, c-format
+#: g10/keyedit.c:419 g10/pkclist.c:275
+#, c-format
 msgid "  %d = I trust marginally\n"
-msgstr " %d = Ik vertrouw een beetje\n"
+msgstr "  %d = Ik vertrouw het maar matig\n"
 
-#: g10/keyedit.c:407 g10/pkclist.c:276
-#, fuzzy, c-format
+#: g10/keyedit.c:420 g10/pkclist.c:277
+#, c-format
 msgid "  %d = I trust fully\n"
-msgstr " %d = Ik vertrouw volledig\n"
+msgstr "  %d = Ik vertrouw het volledig\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:439
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
+"Geef de diepte van het vertrouwen aan.\n"
+"Als de waarde meer als 1 is, kan deze sleutel vertrouwen uitschrijven op\n"
+"Uw naam.\n"
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:455
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
+"Geef alstublieft het domein aan waarbinnen deze handtekening geldig\n"
+"is, laat leeg voor geen.\n"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
-msgstr "Gebruikerscode \"%s\" is herroepen."
+msgstr "Gebruiker ID “%s” is ingetrokken."
 
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1486
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
+#: g10/keyedit.c:890 g10/keyedit.c:1736
+#, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
-msgstr "Weet u zeker dat u deze toch wilt ondertekenen? (j/N) "
+msgstr "Weet U zeker dat U deze nog wilt ondertekenen? (j/N) "
 
-#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
+#: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
-msgstr "  Kan niet ondertekenen.\n"
+msgstr "  Het is niet mogelijk te ondertekenen.\n"
 
-#: g10/keyedit.c:610
-#, fuzzy, c-format
+#: g10/keyedit.c:628
+#, c-format
 msgid "User ID \"%s\" is expired."
-msgstr "Gebruikerscode \"%s\" is herroepen."
+msgstr "Gebruiker ID “%s” is verlopen."
 
-#: g10/keyedit.c:636
-#, fuzzy, c-format
+#: g10/keyedit.c:656
+#, c-format
 msgid "User ID \"%s\" is not self-signed."
-msgstr "WAARSCHUWING: gebruikerscode \"%s\" is niet zelfondertekend.\n"
+msgstr "Gebruiker ID “%s” is niet zelf-ondertekened."
+
+#: g10/keyedit.c:684
+#, c-format
+msgid "User ID \"%s\" is signable.  "
+msgstr "Gebruiker ID “%s” is te ondertekenen.  "
+
+#: g10/keyedit.c:686
+#, fuzzy
+msgid "Sign it? (y/N) "
+msgstr "Ondertekenen? (j/N) "
 
-#: g10/keyedit.c:675
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
-"De zelfondertekening op \"%s\"\n"
-"is een PGP 2.x-stijl ondertekening.\n"
+"De zelf-ondertekening van “%s”\n"
+"is een PGP 2.x ondertekening.\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:717
+#, fuzzy
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
-msgstr "Wilt u deze promoveren tot een OpenPGP zelfondertekening? (j/N) "
+msgstr "Wilt u deze opwarderen tot een OpenPGP zelf-ondertekening? (j/N) "
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
-"Uw huidige ondertekening van \"%s\"\n"
+"Uw huidige ondertekening op “%s”\n"
 "is verlopen.\n"
 
-#: g10/keyedit.c:702
+#: g10/keyedit.c:735
+#, fuzzy
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
-"Wilt u een nieuwe ondertekening plaatsen om de oude te vervangen? (j/N) "
+"Wilt U een nieuwe ondertekening uitgeven om de verlopen versie te "
+"vervangen ? (j/N) "
 
-#: g10/keyedit.c:723
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
-"Uw huidige ondertekening van \"%s\"\n"
-"is een lokale ondertekening.\n"
+"Uw huidige ondertekening op “%s”\n"
+"is een locale ondertekening.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:760
+#, fuzzy
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
-"WIlt u deze promoveren tot een volledig uitvoerbare ondertekening? (j/N) "
+"Wilt u deze opwarderen naar een volledig exporteerbare ondertekening? (j/N) "
 
-#: g10/keyedit.c:748
-#, fuzzy, c-format
+#: g10/keyedit.c:781
+#, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
-msgstr "\"%s\" was al lokaal ondertekend met sleutel %08lX\n"
+msgstr "“%s” was reeds lokaal ondertekend door sleutel %s\n"
 
-#: g10/keyedit.c:751
-#, fuzzy, c-format
+#: g10/keyedit.c:784
+#, c-format
 msgid "\"%s\" was already signed by key %s\n"
-msgstr "\"%s\" was al ondertekend met sleutel %08lX\n"
+msgstr "“%s” was reeds ondertekend met sleutel %s\n"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:789
+#, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
-msgstr "Wilt u deze toch ondertekenen? (j/N) "
+msgstr "Wilt U toch ondertekenen? (j/N) "
 
-#: g10/keyedit.c:778
-#, fuzzy, c-format
+#: g10/keyedit.c:811
+#, c-format
 msgid "Nothing to sign with key %s\n"
-msgstr "Niets te ondertekenen bij sleutel %08lX\n"
+msgstr "Er is niets te ondertekenen met sleutel %s\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Deze sleutel is verlopen!"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
-msgstr "Deze sleutel zal verlopen op %s.\n"
+msgstr "Deze sleutel is verlopen na %s.\n"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:848
+#, fuzzy
 msgid "Do you want your signature to expire at the same time? (Y/n) "
-msgstr "Wilt u dat uw ondertekening op hetzelfde moment verloopt? (J/n) "
+msgstr "Wilt U dat de geldigheid van de ondertekening net zo lang is? (J/n) "
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:883
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
-"U kunt geen OpenPGP-ondertekening maken van een PGP 2.x sleutel in --pgp2 "
-"modus.\n"
+"U mag geen OpenPGP ondertekening zetten bij een PGP 2.x sleutel als U \n"
+"de optie --pgp2 gebruikt.\n"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:885
 msgid "This would make the key unusable in PGP 2.x.\n"
-msgstr "Dit zou de sleutel onbruikbaar maken in PGP 2.x.\n"
+msgstr "Dit maakt de sleutel onbruikbaar met PGP 2.x.\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:910
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
-"Hoe nauwkeurig heeft u gecontroleerd dat de sleutel die u nu ondertekent "
-"echt\n"
-"is van de bovengenoemde persoon?  Als u geen antwoord weet, kies \"0\".\n"
+"Hoe zorgvuldig heeft U gecontroleerd dat deze sleutel werkelijk van de \n"
+"hierboven genoemde persoon is ? In geval van twijfel moet U “0” kiezen\n"
 
-#: g10/keyedit.c:882
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (0) I will not answer.%s\n"
-msgstr "   (0) Ik geef geen antwoord.%s\n"
+msgstr "   (0) Hierop geef ik geen antwoord.%s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
-msgstr "   (1) Ik heb helemaal niet gecontroleerd.%s\n"
+msgstr "   (1) Ik heb het niet gecontroleerd.%s\n"
 
-#: g10/keyedit.c:886
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
-msgstr "   (2) Ik heb nonchalant gecontroleerd.%s\n"
+msgstr "   (2) Ik heb een aantal controles uitgevoerd.%s\n"
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
-msgstr "   (3) Ik heb heel nauwkeurig gecontroleerd.%s\n"
+msgstr "   (3) Ik heb zeer zorgvuldig gecontroleerd.%s\n"
 
-#: g10/keyedit.c:894
-msgid "Your selection? (enter '?' for more information): "
-msgstr ""
+#: g10/keyedit.c:927
+msgid "Your selection? (enter `?' for more information): "
+msgstr "Uw keuze? (geef ‘?’ voor meer informatie): "
 
-#: g10/keyedit.c:918
-#, fuzzy, c-format
+#: g10/keyedit.c:951
+#, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr ""
-"Weet u zeker dat u deze sleutel wilt ondertekenen\n"
-"met uw sleutel: \""
+"Weet u zeker dat U deze sleutel wilt ondertekenen met Uw sleutel\n"
+" “%s” (%s)\n"
 
-#: g10/keyedit.c:925
-#, fuzzy
+#: g10/keyedit.c:958
 msgid "This will be a self-signature.\n"
-msgstr ""
-"\n"
-"Dit zal een zelfondertekening zijn.\n"
+msgstr "Dit is een zelf-ondertekening.\n"
 
-#: g10/keyedit.c:931
-#, fuzzy
+#: g10/keyedit.c:964
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
-"\n"
-"WAARSCHUWING: de ondertekening zal niet worden gemarkeerd als niet-"
-"uitvoerbaar.\n"
+"Waarschuwing: de ondertekening zal niet als 'niet exporteerbaar'\n"
+"worden gemarkeerd\n"
 
-#: g10/keyedit.c:939
-#, fuzzy
+#: g10/keyedit.c:972
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
-"\n"
-"WAARSCHUWING: de ondertekening zal niet worden gemarkeerd als niet-"
-"herroepbaar.\n"
+"Waarschuwing: de ondertekening zal niet als 'niet intrekbaar'\n"
+"worden gemarkeerd\n"
 
-#: g10/keyedit.c:949
-#, fuzzy
+#: g10/keyedit.c:982
 msgid "The signature will be marked as non-exportable.\n"
-msgstr ""
-"\n"
-"De ondertekening zal worden gemarkeerd als niet-uitvoerbaar.\n"
+msgstr "De ondertekening wordt 'niet exporteerbaar' gemarkeerd.\n"
 
-#: g10/keyedit.c:956
-#, fuzzy
+#: g10/keyedit.c:989
 msgid "The signature will be marked as non-revocable.\n"
-msgstr ""
-"\n"
-"De ondertekening zal worden gemarkeerd als niet-herroepbaar.\n"
+msgstr "De ondertekening wordt 'niet intrekbaar' gemarkeerd.\n"
 
-#: g10/keyedit.c:963
-#, fuzzy
+#: g10/keyedit.c:996
 msgid "I have not checked this key at all.\n"
-msgstr ""
-"\n"
-"Ik heb deze sleutel helemaal niet gecontroleerd.\n"
+msgstr "Ik heb deze sleutel niet gecontroleerd.\n"
 
-#: g10/keyedit.c:968
-#, fuzzy
+#: g10/keyedit.c:1001
 msgid "I have checked this key casually.\n"
-msgstr ""
-"\n"
-"Ik heb deze sleutel nonchalant gecontroleerd.\n"
+msgstr "Ik heb enige controles uitgevoerd.\n"
 
-#: g10/keyedit.c:973
-#, fuzzy
+#: g10/keyedit.c:1006
 msgid "I have checked this key very carefully.\n"
-msgstr ""
-"\n"
-"Ik heb deze sleutel heel nauwkeurig gecontroleerd.\n"
+msgstr "Ik heb deze sleutel zorgvuldig gecontroleerd.\n"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1016
 #, fuzzy
 msgid "Really sign? (y/N) "
-msgstr "Echt ondertekenen? "
+msgstr "Weet u het zeker? (j/N) "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3891 g10/keyedit.c:3982 g10/keyedit.c:4055
-#: g10/sign.c:369
+#: g10/keyedit.c:1061 g10/keyedit.c:4793 g10/keyedit.c:4884 g10/keyedit.c:4948
+#: g10/keyedit.c:5009 g10/sign.c:351
 #, c-format
 msgid "signing failed: %s\n"
-msgstr "ondertekenen mislukt: %s\n"
+msgstr "ondertekenen is mislukt: %s\n"
+
+#: g10/keyedit.c:1126
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+"Deze sleutel bestaat alleen uit een verwijzing -\n"
+"er is geen geheime zin om te veranderen.\n"
 
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1137 g10/keygen.c:3215
 msgid "This key is not protected.\n"
-msgstr "Deze sleutel is niet beschermd.\n"
+msgstr "Deze sleutel is niet beveiligd.\n"
 
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
-msgstr "Geheime delen van primaire sleutel zijn niet beschikbaar.\n"
+msgstr "Geheime delen van primaire sleutels zijn niet beschikbaar.\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1145 g10/keygen.c:3218
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "Geheime delen van primaire sleutels zijn opgeslagen op een kaart.\n"
+
+#: g10/keyedit.c:1149 g10/keygen.c:3222
 msgid "Key is protected.\n"
-msgstr "Sleutel is beschermd.\n"
+msgstr "Sleutel is beveiligd.\n"
 
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1173
 #, c-format
 msgid "Can't edit this key: %s\n"
-msgstr "Kan deze sleutel niet bewerken: %s\n"
+msgstr "Deze sleutel kan niet aangepast worden: %s\n"
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1179
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
-"Geef het nieuwe wachtwoord voor deze geheime sleutel.\n"
+"Geef de nieuwe 'geheime zin' voor deze geheime sleutel.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1806
+#: g10/keyedit.c:1188 g10/keygen.c:1895
 msgid "passphrase not correctly repeated; try again"
-msgstr "wachtwoord niet juist herhaald; probeer opnieuw"
+msgstr "de geheime zin is niet twee keer hetzelfde; probeer opnieuw"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1193
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
-"U wilt geen wachtwoord - dit is waarschijnlijk een *slecht* idee!\n"
+"U heeft opgegeven geen geheime zin te willen - Dit is misschien een slecht "
+"idee\n"
 "\n"
 
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1196
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
-msgstr "Wilt u dit echt doen? "
+msgstr "Weet u het zeker? (j/N) "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1267
 msgid "moving a key signature to the correct place\n"
-msgstr "een sleutelondertekening wordt naar de juiste plek verplaatst\n"
-
-#: g10/keyedit.c:1247
-msgid "save"
-msgstr "save"
+msgstr "verplaatsen van de sleutel ondertekening naar de juiste plek\n"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1353
 msgid "save and quit"
-msgstr "opslaan en afsluiten"
-
-#: g10/keyedit.c:1250
-msgid "fpr"
-msgstr "fpr"
+msgstr "opslaan en stoppen"
 
-#: g10/keyedit.c:1250
-msgid "show fingerprint"
-msgstr "vingerafdruk weergeven"
+#: g10/keyedit.c:1356
+msgid "show key fingerprint"
+msgstr "toon sleutel vingerafdruk"
 
-#: g10/keyedit.c:1251
+#: g10/keyedit.c:1357
 msgid "list key and user IDs"
-msgstr "sleutel en gebruikerscodes opsommen"
+msgstr "tonen sleutels en Gebruiker ID's"
 
-#: g10/keyedit.c:1253
-msgid "uid"
-msgstr "uid"
-
-#: g10/keyedit.c:1253
+#: g10/keyedit.c:1359
 msgid "select user ID N"
-msgstr "gebruikerscode N selecteren"
-
-#: g10/keyedit.c:1254
-msgid "key"
-msgstr "key"
-
-#: g10/keyedit.c:1254
-msgid "select secondary key N"
-msgstr "secundaire sleutel N kiezen"
-
-#: g10/keyedit.c:1255
-msgid "check"
-msgstr "check"
-
-#: g10/keyedit.c:1255
-msgid "list signatures"
-msgstr "ondertekeningen opsommen"
-
-#: g10/keyedit.c:1256
-msgid "c"
-msgstr "c"
+msgstr "selecteer Gebruiker ID N"
 
-#: g10/keyedit.c:1257
-msgid "sign"
-msgstr "sign"
+#: g10/keyedit.c:1360
+msgid "select subkey N"
+msgstr "selecteer sub-sleutel N"
 
-#: g10/keyedit.c:1257
-msgid "sign the key"
-msgstr "de sleutel ondertekenen"
+#: g10/keyedit.c:1361
+msgid "check signatures"
+msgstr "controleren ondertekeningen"
 
-#: g10/keyedit.c:1258
-msgid "s"
-msgstr "s"
-
-#: g10/keyedit.c:1259
-#, fuzzy
-msgid "tsign"
-msgstr "sign"
-
-#: g10/keyedit.c:1259
-#, fuzzy
-msgid "make a trust signature"
-msgstr "een losse ondertekening maken"
-
-#: g10/keyedit.c:1260
-msgid "lsign"
-msgstr "lsign"
-
-#: g10/keyedit.c:1260
-msgid "sign the key locally"
-msgstr "de sleutel lokaal ondertekenen"
-
-#: g10/keyedit.c:1261
-msgid "nrsign"
-msgstr "nrsign"
-
-#: g10/keyedit.c:1261
-msgid "sign the key non-revocably"
-msgstr "de sleutel niet-herroepbaar ondertekenen"
+#: g10/keyedit.c:1366
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr ""
+"onderteken geselecteerde Gebruikers ID's\n"
+"[* zie hieronder voor gerelateerde commando's]"
 
-#: g10/keyedit.c:1262
-msgid "nrlsign"
-msgstr "nrlsign"
+#: g10/keyedit.c:1371
+msgid "sign selected user IDs locally"
+msgstr "onderteken geselecteerde Gebruiker ID's lokaal"
 
-#: g10/keyedit.c:1262
-msgid "sign the key locally and non-revocably"
-msgstr "de sleutel lokaal en niet-herroepbaar ondertekenen"
+#: g10/keyedit.c:1373
+msgid "sign selected user IDs with a trust signature"
+msgstr ""
+"onderteken geselecteerde Gebruiker ID's met een vertrouwens ondertekening"
 
-#: g10/keyedit.c:1264
-msgid "adduid"
-msgstr "adduid"
+#: g10/keyedit.c:1375
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr ""
+"onderteken geselecteerde Gebruiker ID's met een niet ophefbare\n"
+"ondertekening"
 
-#: g10/keyedit.c:1264
+#: g10/keyedit.c:1379
 msgid "add a user ID"
-msgstr "een gebruikerscode toevoegen"
-
-#: g10/keyedit.c:1265
-msgid "addphoto"
-msgstr "addphoto"
+msgstr "toevoegen van een Gebruiker ID"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1381
 msgid "add a photo ID"
-msgstr "een foto ID toevoegen"
-
-#: g10/keyedit.c:1266
-msgid "deluid"
-msgstr "deluid"
-
-#: g10/keyedit.c:1266
-msgid "delete user ID"
-msgstr "gebruikerscode verwijderen"
+msgstr "toevoegen van een foto ID"
 
-#: g10/keyedit.c:1268
-msgid "delphoto"
-msgstr "delphoto"
+#: g10/keyedit.c:1383
+msgid "delete selected user IDs"
+msgstr "verwijder geslecteerde Gebruiker ID's"
 
-#: g10/keyedit.c:1269
-msgid "addkey"
-msgstr "addkey"
+#: g10/keyedit.c:1388
+msgid "add a subkey"
+msgstr "toevoegen van een sub-sleutel"
 
-#: g10/keyedit.c:1269
-msgid "add a secondary key"
-msgstr "een secundaire sleutel toevoegen"
-
-#: g10/keyedit.c:1271
-#, fuzzy
-msgid "addcardkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1392
 msgid "add a key to a smartcard"
-msgstr ""
+msgstr "toevoegen van een sleutel op de smartcard"
 
-#: g10/keyedit.c:1272
-msgid "keytocard"
-msgstr ""
-
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1394
 msgid "move a key to a smartcard"
-msgstr ""
+msgstr "verplaatsen van een sleutel naar de smartcard"
 
-#: g10/keyedit.c:1274
-msgid "delkey"
-msgstr "delkey"
+#: g10/keyedit.c:1396
+msgid "move a backup key to a smartcard"
+msgstr "verplaatsen van een reserve sleutel naar de smartcard"
 
-#: g10/keyedit.c:1274
-msgid "delete a secondary key"
-msgstr "een secundaire sleutel verwijderen"
+#: g10/keyedit.c:1400
+msgid "delete selected subkeys"
+msgstr "verwijderen van geselecteerde sub-sleutels"
 
-#: g10/keyedit.c:1275
-msgid "addrevoker"
-msgstr "addrevoker"
-
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1402
 msgid "add a revocation key"
-msgstr "een herroepingssleutel toevoegen"
-
-#: g10/keyedit.c:1276
-msgid "delsig"
-msgstr "delsig"
-
-#: g10/keyedit.c:1276
-msgid "delete signatures"
-msgstr "ondertekeningen verwijderen"
-
-#: g10/keyedit.c:1277
-msgid "expire"
-msgstr "expire"
-
-#: g10/keyedit.c:1277
-msgid "change the expire date"
-msgstr "de verloopdatum wijzigen"
-
-#: g10/keyedit.c:1278
-msgid "primary"
-msgstr "primary"
+msgstr "toevoegen van een intrekkingssleutel"
 
-#: g10/keyedit.c:1278
-msgid "flag user ID as primary"
-msgstr "gebruikerscode als primair markeren"
+#: g10/keyedit.c:1404
+msgid "delete signatures from the selected user IDs"
+msgstr "verwijder ondertekeningen van de geslecteerde Gebruiker ID's"
 
-#: g10/keyedit.c:1279
-msgid "toggle"
-msgstr "toggle"
+#: g10/keyedit.c:1406
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "verander de verval datum voor de geselecteerde (sub-)sleutels"
 
-#: g10/keyedit.c:1279
-msgid "toggle between secret and public key listing"
-msgstr "overschakelen tussen geheime en openbare sleutellijst"
+#: g10/keyedit.c:1408
+msgid "flag the selected user ID as primary"
+msgstr "markeer de geselecteerde Gebruikers ID als primair"
 
-#: g10/keyedit.c:1281
-msgid "t"
-msgstr "t"
+#: g10/keyedit.c:1410
+msgid "toggle between the secret and public key listings"
+msgstr "wissel tussen de geheime en publieke sleutel lijsten"
 
-#: g10/keyedit.c:1282
-msgid "pref"
-msgstr "pref"
-
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1413
 msgid "list preferences (expert)"
-msgstr "lijst voorkeuren (ervaren gebruiker)"
-
-#: g10/keyedit.c:1283
-msgid "showpref"
-msgstr "showpref"
+msgstr "toon voorkeuren (expert)"
 
-#: g10/keyedit.c:1283
+#: g10/keyedit.c:1415
 msgid "list preferences (verbose)"
-msgstr "lijst voorkeuren (breedsprakig)"
-
-#: g10/keyedit.c:1284
-msgid "setpref"
-msgstr "setpref"
-
-#: g10/keyedit.c:1284
-msgid "set preference list"
-msgstr "voorkeurenlijst instellen"
-
-#: g10/keyedit.c:1285
-msgid "updpref"
-msgstr "updpref"
+msgstr "toon voorkeuren (langdradig)"
 
-#: g10/keyedit.c:1285
-msgid "updated preferences"
-msgstr "voorkeuren bijgewerkt"
+#: g10/keyedit.c:1417
+msgid "set preference list for the selected user IDs"
+msgstr "stel voorkeuren in voor de geselecteerde Gebruikers ID's"
 
-#: g10/keyedit.c:1286
-#, fuzzy
-msgid "keyserver"
-msgstr "sleutelserverfout"
+#: g10/keyedit.c:1422
+msgid "set the preferred keyserver URL for the selected user IDs"
+msgstr ""
+"stel de voorkeur sleutel server URL in voor de geselecteerde Gebruiker ID's"
 
-#: g10/keyedit.c:1286
-#, fuzzy
-msgid "set preferred keyserver URL"
-msgstr "kon sleutelserver URI niet inlezen\n"
+#: g10/keyedit.c:1424
+msgid "set a notation for the selected user IDs"
+msgstr "stel de schrijfwijze in voor de geselecteerde Gebruikers ID's"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
-msgstr "het wachtwoord wijzigen"
-
-#: g10/keyedit.c:1288
-msgid "trust"
-msgstr "trust"
+msgstr "wijzig de geheime zin"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
-msgstr "het eigenaarsvertrouwen wijzigen"
+msgstr "wijzig eigenaarsvertrouwen"
 
-#: g10/keyedit.c:1289
-msgid "revsig"
-msgstr "revsig"
-
-#: g10/keyedit.c:1289
-msgid "revoke signatures"
-msgstr "ondertekeningen herroepen"
-
-#: g10/keyedit.c:1290
-msgid "revuid"
-msgstr "revuid"
-
-#: g10/keyedit.c:1290
-msgid "revoke a user ID"
-msgstr "een gebruikerscode herroepen"
-
-#: g10/keyedit.c:1291
-msgid "revkey"
-msgstr "revkey"
+#: g10/keyedit.c:1432
+msgid "revoke signatures on the selected user IDs"
+msgstr "ingetrekken van de ondertekeningen van de geselecteerde Gebruiker ID's"
 
-#: g10/keyedit.c:1291
-msgid "revoke a secondary key"
-msgstr "een secundaire sleutel herroepen"
+#: g10/keyedit.c:1434
+msgid "revoke selected user IDs"
+msgstr "ingetrekken van de geselecteerde Gebruiker ID's"
 
-#: g10/keyedit.c:1292
-msgid "disable"
-msgstr "disable"
+#: g10/keyedit.c:1439
+msgid "revoke key or selected subkeys"
+msgstr "intrekken sleutel of geselecteerde sub-sleutels"
 
-#: g10/keyedit.c:1292
-msgid "disable a key"
-msgstr "een sleutel uit zetten"
+#: g10/keyedit.c:1440
+msgid "enable key"
+msgstr "inschakelen sleutel"
 
-#: g10/keyedit.c:1293
-msgid "enable"
-msgstr "enable"
+#: g10/keyedit.c:1441
+msgid "disable key"
+msgstr "uitzetten sleutel"
 
-#: g10/keyedit.c:1293
-msgid "enable a key"
-msgstr "een sleutel aan zetten"
+#: g10/keyedit.c:1442
+msgid "show selected photo IDs"
+msgstr "tonen geselekteerde foto ID's"
 
-#: g10/keyedit.c:1294
-msgid "showphoto"
-msgstr "showphoto"
+#: g10/keyedit.c:1444
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr "compact unusable user IDs and remove unusable signatures from key"
 
-#: g10/keyedit.c:1294
-msgid "show photo ID"
-msgstr "foto ID weergeven"
+#: g10/keyedit.c:1446
+msgid "compact unusable user IDs and remove all signatures from key"
+msgstr ""
+"comprimeer onbruikbare Gebruiker ID's en verwijder onbruikebare\n"
+"ondertekeningen van de sleutel"
 
-#: g10/keyedit.c:1347
-#, fuzzy, c-format
+#: g10/keyedit.c:1564
+#, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
-msgstr "fout bij lezen geheim sleutelblok `%s': %s\n"
+msgstr "Fout bij het lezen van geheim sleutelblok “%s”: %s\n"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1582
 msgid "Secret key is available.\n"
 msgstr "Geheime sleutel is beschikbaar.\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1663
 msgid "Need the secret key to do this.\n"
-msgstr "De geheime sleutel is nodig om dit te doen.\n"
+msgstr "Hiervoor is een geheime sleutel noodzakelijk.\n"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1671
 msgid "Please use the command \"toggle\" first.\n"
-msgstr "Gebruik alstublieft eerst de \"toggle\" opdracht.\n"
+msgstr "Gebruik eerst het “wissel” (toggle) commando.\n"
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1690
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+"  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+"* Het ‘onderteken’ commando sign kan worden voorgegaan door een l (lsign) "
+"om\n"
+"  een lokaale ondertekening te maken,   een ‘t’ voor "
+"vertrouwensondertekening (tsign), een ‘nr’ (non-revocable) code\n"
+" of een combinatie van deze (ltsign, tnrsign, etc.).\n"
+
+#: g10/keyedit.c:1730
 msgid "Key is revoked."
-msgstr "Sleutel is herroepen."
+msgstr "Sleutel is ingetrokken."
 
-#: g10/keyedit.c:1500
+#: g10/keyedit.c:1749
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
-msgstr "Echt alle gebruikerscodes ondertekenen? "
+msgstr "Weet U zeker dat U alle Gebruiker ID's wilt ondertekenen? (j/N) "
 
-#: g10/keyedit.c:1502
+#: g10/keyedit.c:1756
 msgid "Hint: Select the user IDs to sign\n"
-msgstr "Tip: Selecteer de gebruikerscodes om te ondertekenen\n"
+msgstr "Hint: Selecteer de Gebruiker ID's die U wilt ondertekenen\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1765
+#, c-format
+msgid "Unknown signature type `%s'\n"
+msgstr "Onbekend ondertekeningstype ‘%s’\n"
+
+#: g10/keyedit.c:1788
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
-msgstr "Deze opdracht is niet toegestaan in %s modus.\n"
+msgstr "Dit commando is niet toegestaan in %s modus.\n"
 
-#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
+#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
 msgid "You must select at least one user ID.\n"
-msgstr "U dient tenminste één gebruikerscode te selecteren.\n"
+msgstr "U moet minimaal een Gebruiker ID selecteren.\n"
 
-#: g10/keyedit.c:1551
+#: g10/keyedit.c:1812
 msgid "You can't delete the last user ID!\n"
-msgstr "U kunt niet de laatste gebruikerscode verwijderen!\n"
+msgstr "U kan de laatste Gebruiker ID niet verwijderen!\n"
 
-#: g10/keyedit.c:1553
+#: g10/keyedit.c:1814
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
-msgstr "Echt alle geselecteerde gebruikerscodes verwijderen? "
+msgstr ""
+"Wilt U wereklijk alle geselecteerde Gebruiker ID's verwijderen ? (j/N) "
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1815
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
-msgstr "Echt deze gebruikerscode verwijderen? "
+msgstr "Weet u zeker dat u deze Gebruiker ID wilt verwijderen ? (j/N) "
 
-#: g10/keyedit.c:1604
+#: g10/keyedit.c:1865
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
-msgstr "Echt deze gebruikerscode verwijderen? "
+msgstr "Weet u zeker dat U de primaire sleutel wilt verplaatsen ? (j/N) "
 
-#: g10/keyedit.c:1616
-#, fuzzy
+#: g10/keyedit.c:1877
 msgid "You must select exactly one key.\n"
-msgstr "U dient tenminste één sleutel te selecteren.\n"
+msgstr "U moet een (1) sleutel selecteren.\n"
 
-#: g10/keyedit.c:1636 g10/keyedit.c:1691
+#: g10/keyedit.c:1905
+msgid "Command expects a filename argument\n"
+msgstr "Commando verwacht een bestandsnaam als argument\n"
+
+#: g10/keyedit.c:1919
+#, c-format
+msgid "Can't open `%s': %s\n"
+msgstr "Kan ‘%s’ niet openenen: %s\n"
+
+#: g10/keyedit.c:1936
+#, c-format
+msgid "Error reading backup key from `%s': %s\n"
+msgstr "Fout bij het lezen van reserve sleutel van ‘%s’: %s\n"
+
+#: g10/keyedit.c:1960
 msgid "You must select at least one key.\n"
-msgstr "U dient tenminste één sleutel te selecteren.\n"
+msgstr "U moet minimaal een sleutel selecteren.\n"
 
-#: g10/keyedit.c:1639
+#: g10/keyedit.c:1963
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
-msgstr "Wilt u echt de geselecteerde sleutels verwijderen? "
+msgstr "Weet U zeker dat u de geselecteerde sleutels wilt wissen? (j/N) "
 
-#: g10/keyedit.c:1640
+#: g10/keyedit.c:1964
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
-msgstr "Wilt u echt deze sleutel verwijderen? "
+msgstr "Weet U zeker dat u deze sleutel wilt wissen? (j/N) "
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1999
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
-msgstr "Echt alle geselecteerde gebruikerscodes herroepen? "
+msgstr "Wilt U de geselecteerde Gebruiker ID's intrekken? (j/N) "
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:2000
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
-msgstr "Echt deze gebruikerscode herroepen? "
+msgstr "Wilt U deze Gebruiker ID intrekken? (j/N) "
 
-#: g10/keyedit.c:1695
+#: g10/keyedit.c:2018
 #, fuzzy
-msgid "Do you really want to revoke the selected keys? (y/N) "
-msgstr "Wilt u echt de geselecteerde sleutels herroepen? "
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "Wilt U deze sleutel volledig intrekken? (j/N) "
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:2029
 #, fuzzy
-msgid "Do you really want to revoke this key? (y/N) "
-msgstr "Wilt u echt deze sleutel herroepen? "
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
+msgstr "Wilt U de geselecteerde sub-sleutels intrekken? (j/N) "
 
-#: g10/keyedit.c:1735
+#: g10/keyedit.c:2031
+#, fuzzy
+msgid "Do you really want to revoke this subkey? (y/N) "
+msgstr "Wilt U deze sub-sleutel intrekken? (j/N) "
+
+#: g10/keyedit.c:2081
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
+"Eigenaarsvertrouwen kan niet ingesteld worden in een door een gebruiker\n"
+"aangeboden vertrouwenslijst\n"
 
-#: g10/keyedit.c:1767
-#, fuzzy
+#: g10/keyedit.c:2123
 msgid "Set preference list to:\n"
-msgstr "voorkeurenlijst instellen"
+msgstr "Stel voorkeur lijst in:\n"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
-msgstr "Echt de voorkeuren bijwerken voor de geselecteerde gebruikerscodes? "
+msgstr "De voorkeuren aanpassen van de geselecteerde Gebruiker ID's? (j/N) "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
-msgstr "Echt de voorkeuren bijwerken? "
+msgstr "De voorkeuren aanpassen? (j/N) "
 
-#: g10/keyedit.c:1825
+#: g10/keyedit.c:2199
 #, fuzzy
 msgid "Save changes? (y/N) "
-msgstr "Wijzigingen opslaan? "
+msgstr "Aanpassingen opslaan? (j/N) "
 
-#: g10/keyedit.c:1828
+#: g10/keyedit.c:2202
 #, fuzzy
 msgid "Quit without saving? (y/N) "
-msgstr "Afsluiten zonder op te slaan? "
+msgstr "Stoppen zonder opslaan? (j/N) "
 
-#: g10/keyedit.c:1838
+#: g10/keyedit.c:2212
 #, c-format
 msgid "update failed: %s\n"
-msgstr "bijwerken mislukt: %s\n"
+msgstr "update failed: %s\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update secret failed: %s\n"
-msgstr "bijwerken geheim mislukt: %s\n"
+msgstr "aanpassen van geheimen is mislukt: %s\n"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:2226
 msgid "Key not changed so no update needed.\n"
-msgstr "Sleutel niet gewijzigd dus bijwerken niet nodig.\n"
+msgstr "Sleutel is niet aangepast, dus er is geen verbetering nodig.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:2327
 msgid "Digest: "
 msgstr "Samenvatting: "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:2379
 msgid "Features: "
-msgstr "Mogelijkheden: "
+msgstr "Eigenschappen: "
 
-#: g10/keyedit.c:1987
+#: g10/keyedit.c:2390
 msgid "Keyserver no-modify"
-msgstr ""
+msgstr "Sleutelserver is niet wijzigbaar"
 
-#: g10/keyedit.c:2002 g10/keylist.c:244
+#: g10/keyedit.c:2405 g10/keylist.c:308
 msgid "Preferred keyserver: "
-msgstr ""
+msgstr "Voorkeur sleutelserver: "
+
+#: g10/keyedit.c:2413 g10/keyedit.c:2414
+msgid "Notations: "
+msgstr "Opmerkingen: "
+
+#: g10/keyedit.c:2624
+msgid "There are no preferences on a PGP 2.x-style user ID.\n"
+msgstr "Er zijn geen voorkeuren in een PGP 2.x Gebruiker ID.\n"
+
+#: g10/keyedit.c:2683
+#, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "Deze sleutel is ingetrokken op %s door %s sleutel %s\n"
 
-#: g10/keyedit.c:2245
-#, fuzzy, c-format
+#: g10/keyedit.c:2704
+#, c-format
 msgid "This key may be revoked by %s key %s"
-msgstr "Deze sleutel is mogelijk herroepen door sleutel %s "
+msgstr "Deze sleutel kan zijn ingetrokken door %s sleutel %s"
 
-#: g10/keyedit.c:2251
-#, fuzzy
+#: g10/keyedit.c:2710
 msgid "(sensitive)"
-msgstr " (gevoelig)"
+msgstr "(gevoelig)"
 
-#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2444 g10/keyedit.c:2459
-#: g10/keyserver.c:366
-#, fuzzy, c-format
+#: g10/keyedit.c:2726 g10/keyedit.c:2782 g10/keyedit.c:2843 g10/keyedit.c:2858
+#: g10/keylist.c:194 g10/keyserver.c:511
+#, c-format
 msgid "created: %s"
-msgstr "kan %s niet aanmaken: %s\n"
+msgstr "aangemaakt: %s"
 
-#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
-#, fuzzy, c-format
+#: g10/keyedit.c:2729 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#, c-format
 msgid "revoked: %s"
-msgstr "[herroepen] "
+msgstr "ingetrokken: %s"
 
-#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:829
-#, fuzzy, c-format
+#: g10/keyedit.c:2731 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#, c-format
 msgid "expired: %s"
-msgstr " [verloopt: %s]"
+msgstr "verlopen: %s"
 
-#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2446 g10/keyedit.c:2461
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
-#: g10/keyserver.c:372 g10/mainproc.c:935
-#, fuzzy, c-format
+#: g10/keyedit.c:2733 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#, c-format
 msgid "expires: %s"
-msgstr " [verloopt: %s]"
+msgstr "vervaldatum: %s"
 
-#: g10/keyedit.c:2276
-#, fuzzy, c-format
+#: g10/keyedit.c:2735
+#, c-format
 msgid "usage: %s"
-msgstr " vertrouwen: %c/%c"
+msgstr "gebruik: %s"
 
-#: g10/keyedit.c:2291
-#, fuzzy, c-format
+#: g10/keyedit.c:2750
+#, c-format
 msgid "trust: %s"
-msgstr " vertrouwen: %c/%c"
+msgstr "vertrouwen: %s"
 
-#: g10/keyedit.c:2295
+#: g10/keyedit.c:2754
 #, c-format
 msgid "validity: %s"
-msgstr ""
+msgstr "geldigheid: %s"
 
-#: g10/keyedit.c:2302
+#: g10/keyedit.c:2761
 msgid "This key has been disabled"
-msgstr "Deze sleutel is uit gezet"
+msgstr "Deze sleutel is uitgeschakeld"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2789 g10/keylist.c:200
 msgid "card-no: "
-msgstr ""
+msgstr "kaart nummer: "
 
-#: g10/keyedit.c:2365 g10/keyedit.c:2367 g10/keyedit.c:2369
-#, c-format
-msgid "[%8.8s] "
+#: g10/keyedit.c:2813
+msgid ""
+"Please note that the shown key validity is not necessarily correct\n"
+"unless you restart the program.\n"
 msgstr ""
+"Houd er rekening mee dat het hiergetoonde vertrouwen van de sleutel "
+"mogelijk\n"
+"incorrect is tot U de applicatie herstart.\n"
 
-#: g10/keyedit.c:2365 g10/keyedit.c:2478 g10/keylist.c:782 g10/keyserver.c:376
-#: g10/mainproc.c:1575 g10/trustdb.c:1133
-#, fuzzy
+#: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
-msgstr "[herroepen] "
+msgstr "ingetrokken"
 
-#: g10/keyedit.c:2367 g10/keyedit.c:2480 g10/keylist.c:784 g10/keyserver.c:380
-#: g10/mainproc.c:1577 g10/trustdb.c:500
-#, fuzzy
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
-msgstr "expire"
-
-#: g10/keyedit.c:2406
-msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr "Er zijn geen voorkeuren op een PGP 2.x stijl gebruikerscode.\n"
+msgstr "verlopen"
 
-#: g10/keyedit.c:2414
-msgid ""
-"Please note that the shown key validity is not necessarily correct\n"
-"unless you restart the program.\n"
-msgstr ""
-"Let er alstublieft op dat de weergegeven sleutelgeldigheid niet per sé "
-"juist\n"
-"is tenzij u het programma opnieuw start.\n"
-
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2944
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
+"Waarschuwing: Er is gene primaire sleutel opgegeven. Dit commando kan\n"
+"              er een andere Gebruiker ID gebruikt wordt dan verwacht.\n"
 
-#: g10/keyedit.c:2605
+#: g10/keyedit.c:3005
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
-"WAARSCHUWING: Dit is een PGP2-stijl sleutel.  Het toevoegen van een foto ID "
-"kan\n"
-"         zorgen dat sommige versies van PGP deze sleutel verwerpen.\n"
+"Waarschuwing: Dit is een PGP2 sleutel. Het toevoegen van een foto ID kan er\n"
+"              voor zorgen dat deze sleutel niet meer in PGP2 wordt herkend.\n"
 
-#: g10/keyedit.c:2610 g10/keyedit.c:2888
+#: g10/keyedit.c:3010 g10/keyedit.c:3345
+#, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
-msgstr "Weet u zeker dat u deze toch wilt toevoegen? (j/N) "
+msgstr "Weet U zeker dat U dit wilt toevoegen? (j/N) "
 
-#: g10/keyedit.c:2616
+#: g10/keyedit.c:3016
 msgid "You may not add a photo ID to a PGP2-style key.\n"
-msgstr "U kunt geen foto ID toevoegen aan een PGP2 stijl sleutel.\n"
+msgstr "U kan geen foto ID toevoegen op een PGP2 sleutel.\n"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:3156
+#, fuzzy
 msgid "Delete this good signature? (y/N/q)"
-msgstr "Deze goede ondertekening verwijderen? (j/N/q)"
+msgstr "Deze correcte ondertekening verwijderen? (j/N/s)"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:3166
+#, fuzzy
 msgid "Delete this invalid signature? (y/N/q)"
-msgstr "Deze ongeldige ondertekening verwijderen? (j/N/q)"
+msgstr "Deze ongeldige ondertekening verwijderen? (j/N/s)"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:3170
+#, fuzzy
 msgid "Delete this unknown signature? (y/N/q)"
-msgstr "Deze onbekende ondertekening verwijderen? (j/N/q)"
+msgstr "Deze onbekende ondertekening verwijderen? (j/N/s)"
 
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:3176
+#, fuzzy
 msgid "Really delete this self-signature? (y/N)"
-msgstr "Echt deze zelfondertekening verwijderen? (j/N)"
+msgstr "Deze zelf ondertekening verwijderen? (j/N)"
 
-#: g10/keyedit.c:2790
+#: g10/keyedit.c:3190
 #, c-format
 msgid "Deleted %d signature.\n"
-msgstr "%d ondertekening verwijderd.\n"
+msgstr "Ondertekening %d verwijderd.\n"
 
-#: g10/keyedit.c:2791
+#: g10/keyedit.c:3191
 #, c-format
 msgid "Deleted %d signatures.\n"
-msgstr "%d ondertekeningen verwijderd.\n"
+msgstr "Ondertekeningen %d verwijderd.\n"
 
-#: g10/keyedit.c:2794
+#: g10/keyedit.c:3194
 msgid "Nothing deleted.\n"
 msgstr "Niets verwijderd.\n"
 
-#: g10/keyedit.c:2883
+#: g10/keyedit.c:3227 g10/trustdb.c:1703
+msgid "invalid"
+msgstr "ongeldig"
+
+#: g10/keyedit.c:3229
+#, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "Gebruiker ID “%s” is gecomprimeerd: %s\n"
+
+#: g10/keyedit.c:3236
+#, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "Gebruiker ID “%s”: %d ondertekening verwijderd\n"
+
+#: g10/keyedit.c:3237
+#, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "Gebruiker ID “%s”: %d ondertekeningen verwijderd\n"
+
+#: g10/keyedit.c:3245
+#, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "Gebruiker ID “%s”: reeds geminimaliseerd\n"
+
+#: g10/keyedit.c:3246
+#, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "Gebruiker ID “%s”: reeds opgeschoond\n"
+
+#: g10/keyedit.c:3340
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
-"WAARSCHUWING: Dit is een PGP 2.x-stijl sleutel.  Een aangestelde herroeper\n"
-"         toevoegen kan zorgen dat sommige versies van PGP deze sleutel "
-"verwerpen.\n"
+"Waarschuwing: Dit is een PGP 2.x sleutel. Het toevoegen van een toegewezen\n"
+"         alternative intrekker kan er voor zorgen dat het niet altijd werkt "
+"met PGP.\n"
 
-#: g10/keyedit.c:2894
+#: g10/keyedit.c:3351
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
-msgstr ""
-"U kunt geen aangestelde herroeper toevoegen aan een PGP 2.x stijl sleutel.\n"
+msgstr "U kan geen alternative intrekker toevoegen aan een PGP 2.x sleutel.\n"
 
-#: g10/keyedit.c:2914
+#: g10/keyedit.c:3371
 msgid "Enter the user ID of the designated revoker: "
-msgstr "Geef de gebruikerscode van de aangestelde herroeper: "
+msgstr "Geef de Gebruiker ID van de alternative intrekker: "
 
-#: g10/keyedit.c:2937
+#: g10/keyedit.c:3396
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
-"kan een PGP 2.x stijl sleutel niet aanwijzen als een aangestelde herroeper\n"
+"Het is niet mogelijk een PGP 2.x sleutel te gebruiken als alternative\n"
+"intrekker\n"
 
-#: g10/keyedit.c:2952
+#: g10/keyedit.c:3411
 msgid "you cannot appoint a key as its own designated revoker\n"
-msgstr "u kunt geen sleutel aanwijzen als zijn eigen aangestelde herroeper\n"
+msgstr ""
+"Het is niet mogelijk de eigen sleutel te gebruiken als alternative\n"
+"intrekker\n"
 
-#: g10/keyedit.c:2974
-#, fuzzy
+#: g10/keyedit.c:3433
 msgid "this key has already been designated as a revoker\n"
-msgstr "WAARSCHUWING: Deze sleutel is herroepen door zijn eigenaar!\n"
+msgstr "deze sleutel is al opgegeven als alternative intrekker\n"
 
-#: g10/keyedit.c:2993
+#: g10/keyedit.c:3452
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
-msgstr ""
-"WAARSCHUWING: het aanwijzen van een sleutel als een aangestelde herroeper "
-"kan niet ongedaan gemaakt worden!\n"
+msgstr "Waarschuing: een alternative intrekker kan niet ontkoppeld worden!\n"
 
-#: g10/keyedit.c:2999
+#: g10/keyedit.c:3458
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
-"Wilt u echt deze sleutel aanwijzen als een aangestelde herroeper? (j/N): "
+"Weet U zeker dat u deze sleutel op wilt geven als alternative intrekker? (j/"
+"N) "
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
-msgstr "Verwijder alstublieft selecties van de geheime sleutels.\n"
+msgstr "Haal de gekozen onderdelen uit de geheime sleutel.\n"
 
-#: g10/keyedit.c:3066
-msgid "Please select at most one secondary key.\n"
-msgstr "Selecteer alstublieft ten hoogste één secundaire sleutel.\n"
+#: g10/keyedit.c:3526
+msgid "Please select at most one subkey.\n"
+msgstr "Selecteer een (1) sub-sleutel.\n"
 
-#: g10/keyedit.c:3070
-msgid "Changing expiration time for a secondary key.\n"
-msgstr "De verlooptijd voor een secundaire sleutel wordt gewijzigd.\n"
+#: g10/keyedit.c:3530
+msgid "Changing expiration time for a subkey.\n"
+msgstr "Verander de vervaldatum van de sub-sleutel.\n"
 
-#: g10/keyedit.c:3073
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
-msgstr "De verlooptijd voor de primaire sleutel wordt gewijzigd.\n"
+msgstr "Verander de vervaldatum voor de primaire sleutel.\n"
 
-#: g10/keyedit.c:3119
+#: g10/keyedit.c:3582
 msgid "You can't change the expiration date of a v3 key\n"
-msgstr "U kunt de verlooptijd van een v3-sleutel niet wijzigen\n"
+msgstr "U kan de vervaldatum van een v3 sleutel niet veranderen\n"
 
-#: g10/keyedit.c:3135
+#: g10/keyedit.c:3598
 msgid "No corresponding signature in secret ring\n"
-msgstr "Geen geassocieerde ondertekening in geheime sleutelbos\n"
+msgstr "Er is geen overeenkomstige ondertekening in de geheime sleutel\n"
+
+#: g10/keyedit.c:3678
+#, c-format
+msgid "signing subkey %s is already cross-certified\n"
+msgstr "ondertekening sub-sleutel %s is reeds bevestigd\n"
 
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3684
+#, c-format
+msgid "subkey %s does not sign and so does not need to be cross-certified\n"
+msgstr "sub-sleutel %s ondertekend niet en hoeft dus niet bevestigd te zijn\n"
+
+#: g10/keyedit.c:3846
 msgid "Please select exactly one user ID.\n"
-msgstr "Selecteer alstublieft precies één gebruikerscode.\n"
+msgstr "Selecteer een (1) Gebruiker ID.\n"
 
-#: g10/keyedit.c:3254 g10/keyedit.c:3364 g10/keyedit.c:3483
-#, fuzzy, c-format
+#: g10/keyedit.c:3885 g10/keyedit.c:3995 g10/keyedit.c:4115 g10/keyedit.c:4256
+#, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
-msgstr "v3-zelfondertekening op gebruikerscode \"%s\" wordt overgeslagen\n"
+msgstr "v3 zelf-ondertekening op Gebruiker ID “%s” overgeslagen\n"
 
-#: g10/keyedit.c:3425
+#: g10/keyedit.c:4056
 msgid "Enter your preferred keyserver URL: "
-msgstr ""
+msgstr "Geef de URL van de sleutelserver van uw voorkeur: "
 
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:4136
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
-msgstr "Weet u zeker dat u deze wilt gebruiken (j/N)? "
+msgstr "Weet u zeker dat U deze wilt vervangen? (j/N) "
 
-#: g10/keyedit.c:3505
+#: g10/keyedit.c:4137
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
-msgstr "Weet u zeker dat u deze wilt gebruiken (j/N)? "
+msgstr "Weet u zeker dat u deze wilt verwijderen? (j/N) "
+
+#: g10/keyedit.c:4199
+msgid "Enter the notation: "
+msgstr "Geef de notatie: "
 
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:4348
+#, fuzzy
+msgid "Proceed? (y/N) "
+msgstr "Doorgaan? (j/N) "
+
+#: g10/keyedit.c:4412
 #, c-format
 msgid "No user ID with index %d\n"
-msgstr "Geen gebruikerscode met index %d\n"
+msgstr "Er is geen Gebruiker ID met index %d\n"
 
-#: g10/keyedit.c:3613
+#: g10/keyedit.c:4470
 #, c-format
-msgid "No secondary key with index %d\n"
-msgstr "Geen secundaire sleutel met index %d\n"
+msgid "No user ID with hash %s\n"
+msgstr "Er is geen Gebruiker ID met hash %s\n"
 
-#: g10/keyedit.c:3730
-#, fuzzy, c-format
+#: g10/keyedit.c:4497
+#, c-format
+msgid "No subkey with index %d\n"
+msgstr "Er is geen subsleutel met index %d\n"
+
+#: g10/keyedit.c:4632
+#, c-format
 msgid "user ID: \"%s\"\n"
-msgstr "gebruikerscode: \""
+msgstr "Gebruiker ID: “%s”\n"
 
-#: g10/keyedit.c:3733 g10/keyedit.c:3797 g10/keyedit.c:3840
-#, fuzzy, c-format
+#: g10/keyedit.c:4635 g10/keyedit.c:4699 g10/keyedit.c:4742
+#, c-format
 msgid "signed by your key %s on %s%s%s\n"
-msgstr "   ondertekend door %08lX op %s%s%s\n"
+msgstr "Ondertekend met uw sleutel %s op %s%s%s\n"
 
-#: g10/keyedit.c:3735 g10/keyedit.c:3799 g10/keyedit.c:3842
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 msgid " (non-exportable)"
-msgstr " (niet-uitvoerbaar)"
+msgstr " (niet exporteerbaar)"
 
-#: g10/keyedit.c:3739
+#: g10/keyedit.c:4641
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Deze ondertekening is verlopen op %s.\n"
 
-#: g10/keyedit.c:3743
+#: g10/keyedit.c:4645
+#, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
-msgstr "Weet u zeker dat u deze nog steeds wilt herroepen? (j/N) "
+msgstr "Weet u zeker dat u deze wilt intrekken? (j/N) "
 
-#: g10/keyedit.c:3747
+#: g10/keyedit.c:4649
+#, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
-msgstr "Een herroepingscertificaat maken voor deze ondertekening? (j/N) "
+msgstr "Aanmaken intrekkingscertificaat voor deze ondertekening? (j/N) "
 
-#: g10/keyedit.c:3774
-#, fuzzy, c-format
+#: g10/keyedit.c:4676
+#, c-format
 msgid "You have signed these user IDs on key %s:\n"
-msgstr "U heeft deze gebruikerscodes ondertekend:\n"
+msgstr "U heeft deze Gebruiker IDs ondertekend op sleutel %s:\n"
 
-#: g10/keyedit.c:3800
-#, fuzzy
+#: g10/keyedit.c:4702
 msgid " (non-revocable)"
-msgstr " (niet-uitvoerbaar)"
+msgstr " (niet intrekbaar)"
 
-#: g10/keyedit.c:3807
-#, fuzzy, c-format
+#: g10/keyedit.c:4709
+#, c-format
 msgid "revoked by your key %s on %s\n"
-msgstr "   herroepen door %08lX op %s\n"
+msgstr "ingetrokken door uw sleutel %s op %s\n"
 
-#: g10/keyedit.c:3829
+#: g10/keyedit.c:4731
 msgid "You are about to revoke these signatures:\n"
-msgstr "U staat op het punt deze ondertekeningen te herroepen:\n"
+msgstr "U gaat deze ondertekeningen intrekken:\n"
 
-#: g10/keyedit.c:3849
+#: g10/keyedit.c:4751
+#, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
-msgstr "Echt de herroepingscertificaten maken? (j/N) "
+msgstr "Wilt u deze intrekcertificaten maken? (j/N) "
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:4781
 msgid "no secret key\n"
 msgstr "geen geheime sleutel\n"
 
-#: g10/keyedit.c:3949
+#: g10/keyedit.c:4851
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
-msgstr "gebruikerscode \"%s\" is al herroepen\n"
+msgstr "Gebruiker ID “%s” is reeds ingetrokken\n"
 
-#: g10/keyedit.c:3966
+#: g10/keyedit.c:4868
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
-"WAARSCHUWING: een gebruikerscode ondertekening is van %d seconden in de "
-"toekomst\n"
+"Waarschuwing: een Gebruiker ID is %d seconden in de toekomst gedateerd\n"
+
+#: g10/keyedit.c:4932
+#, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "Sleutel %s is reeds ingetrokken.\n"
 
-#: g10/keyedit.c:4135
-#, fuzzy, c-format
+#: g10/keyedit.c:4994
+#, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "Sub-sleutel %s is reeds ingetrokken.\n"
+
+#: g10/keyedit.c:5089
+#, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
-msgstr ""
-"Foto ID %s van grootte %ld voor sleutel 0x%08lX (gebruiker %d) wordt "
-"weergegeven\n"
+msgstr "Tonen %s foto ID van formaat %ld voor sleutel %s (Gebruiker ID %d)\n"
 
-#: g10/keygen.c:293
-#, fuzzy, c-format
+#: g10/keygen.c:265
+#, c-format
 msgid "preference `%s' duplicated\n"
-msgstr "voorkeur %c%lu komt dubbel voor\n"
+msgstr "voorkeur ‘%s’ overgenomen\n"
 
-#: g10/keygen.c:300
-#, fuzzy
+#: g10/keygen.c:272
 msgid "too many cipher preferences\n"
-msgstr "teveel `%c' voorkeuren\n"
+msgstr "te veel versleutelalgoritme voorkeuren\n"
 
-#: g10/keygen.c:302
-#, fuzzy
+#: g10/keygen.c:274
 msgid "too many digest preferences\n"
-msgstr "teveel `%c' voorkeuren\n"
+msgstr "te veel samenvattingsalgoritme voorkeuren\n"
 
-#: g10/keygen.c:304
-#, fuzzy
+#: g10/keygen.c:276
 msgid "too many compression preferences\n"
-msgstr "teveel `%c' voorkeuren\n"
+msgstr "te veel compressie voorkeuren\n"
 
 #: g10/keygen.c:401
-#, fuzzy, c-format
+#, c-format
 msgid "invalid item `%s' in preference string\n"
-msgstr "ongeldig teken in voorkeurtekenreeks\n"
+msgstr "ongeldige waarde ‘%s’ in voorkeursinstellingen\n"
 
-#: g10/keygen.c:827
+#: g10/keygen.c:876
 msgid "writing direct signature\n"
-msgstr "bezig met schrijven directe ondertekening\n"
+msgstr "directe ondertekening schrijven\n"
 
-#: g10/keygen.c:866
+#: g10/keygen.c:915
 msgid "writing self signature\n"
-msgstr "bezig met schrijven zelf-ondertekening\n"
+msgstr "zelf-ondertekening schrijven\n"
 
-#: g10/keygen.c:912
+#: g10/keygen.c:965
 msgid "writing key binding signature\n"
-msgstr "bezig met schrijven sleutelbindende ondertekening\n"
+msgstr "sleutel koppel ondertekening schrijven\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613
+#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
+#: g10/keygen.c:2776
 #, c-format
 msgid "keysize invalid; using %u bits\n"
-msgstr "sleutelgrootte ongeldig; %u bits worden gebruikt\n"
+msgstr "sleutellengte is ongeldig; %u bits worden gebruikt\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619
+#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
 #, c-format
 msgid "keysize rounded up to %u bits\n"
-msgstr "sleutelgrootte naar boven afgerond tot %u bits\n"
+msgstr "sleutellengte vergroot tot %u bits\n"
 
-#: g10/keygen.c:1247
-#, fuzzy
+#: g10/keygen.c:1331
 msgid "Sign"
-msgstr "sign"
+msgstr "Ondertekenen (Sign)"
 
-#: g10/keygen.c:1250
-#, fuzzy
+#: g10/keygen.c:1334
+msgid "Certify"
+msgstr "Certificeren"
+
+#: g10/keygen.c:1337
 msgid "Encrypt"
-msgstr "gegevens coderen"
+msgstr "Versleutelen (Encrypt)"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1340
 msgid "Authenticate"
-msgstr ""
+msgstr "Authenticeren"
 
-#: g10/keygen.c:1261
+#: g10/keygen.c:1348
 msgid "SsEeAaQq"
-msgstr ""
+msgstr "OoVvAaSs"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1367
 #, c-format
 msgid "Possible actions for a %s key: "
-msgstr ""
+msgstr "Mogelijke acties voor een %s sleutel: "
 
-#: g10/keygen.c:1280
+#: g10/keygen.c:1371
 msgid "Current allowed actions: "
-msgstr ""
+msgstr "Momenteel toegestane acties: "
 
-#: g10/keygen.c:1285
+#: g10/keygen.c:1376
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
-msgstr ""
+msgstr "   (%c) Onderteken mogelijkheid omschakelen\n"
 
-#: g10/keygen.c:1288
-#, fuzzy, c-format
+#: g10/keygen.c:1379
+#, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
-msgstr "   (%d) ElGamal (alleen coderen)\n"
+msgstr "   (%c) Versleutel mogelijkheid omschakelen\n"
 
-#: g10/keygen.c:1291
+#: g10/keygen.c:1382
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
-msgstr ""
+msgstr "   (%c) Authenticatie mogelijkheid omschakelen\n"
 
-#: g10/keygen.c:1294
+#: g10/keygen.c:1385
 #, c-format
 msgid "   (%c) Finished\n"
-msgstr ""
+msgstr "   (%c) Voltooid\n"
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1441
 msgid "Please select what kind of key you want:\n"
-msgstr "Kies alstublieft wat voor sleutel u wilt hebben:\n"
+msgstr "Selecteer het soort sleutel dat u wilt:\n"
 
-#: g10/keygen.c:1350
-#, fuzzy, c-format
+#: g10/keygen.c:1443
+#, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
-msgstr "   (%d) DSA en ElGamal (standaard)\n"
+msgstr "   (%d) DSA en Elgamal (default)\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (alleen ondertekenen)\n"
 
-#: g10/keygen.c:1353
-#, fuzzy, c-format
+#: g10/keygen.c:1446
+#, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) DSA (eigen mogelijkheden instellen)\n"
+
+#: g10/keygen.c:1448
+#, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (alleen coderen)\n"
+msgstr "   (%d) Elgamal (alleen versleutelen)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (alleen ondertekenen)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
-msgstr "   (%d) RSA (alleen coderen)\n"
+msgstr "   (%d) RSA (encrypt only)\n"
 
-#: g10/keygen.c:1358
-#, fuzzy, c-format
+#: g10/keygen.c:1453
+#, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (alleen coderen)\n"
+msgstr "   (%d) RSA (eigen mogelijkheden instellen)\n"
 
-#: g10/keygen.c:1409
+#: g10/keygen.c:1522
 #, c-format
-msgid ""
-"About to generate a new %s keypair.\n"
-"              minimum keysize is  768 bits\n"
-"              default keysize is 1024 bits\n"
-"    highest suggested keysize is 2048 bits\n"
-msgstr ""
-"Er wordt een nieuw %s sleutelpaar aangemaakt.\n"
-"              minimale sleutelgrootte is  768 bits\n"
-"              standaard sleutelgrootte is 1024 bits\n"
-"    hoogst aangeraden sleutelgrootte is 2048 bits\n"
-
-#: g10/keygen.c:1418
-msgid "What keysize do you want? (1024) "
-msgstr "Welke sleutelgrootte wilt u? (1024) "
-
-#: g10/keygen.c:1423
-msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "DSA staat alleen sleutelgroottes toe van 512 tot 1024\n"
+msgid "DSA keypair will have %u bits.\n"
+msgstr "DSA sleutelpaar krijgt %u bits.\n"
 
-#: g10/keygen.c:1425
-msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr ""
-"sleutelgrootte te klein; 1024 is de kleinste toegestane waarde voor RSA.\n"
-
-#: g10/keygen.c:1428
-msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr "sleutelgrootte te klein; 768 is de kleinste toegestane waarde.\n"
-
-#: g10/keygen.c:1439
+#: g10/keygen.c:1532
 #, c-format
-msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "sleutelgrootte te groot; %d is de grootste toegestane waarde.\n"
+msgid "%s keys may be between %u and %u bits long.\n"
+msgstr "%s sleutels moeten tussen %u en %u bits lang zijn.\n"
 
-#: g10/keygen.c:1444
-msgid ""
-"Keysizes larger than 2048 are not suggested because\n"
-"computations take REALLY long!\n"
-msgstr ""
-"Sleutelgroottes boven de 2048 worden niet aangeraden\n"
-"omdat berekeningen daarmee ERG lang duren!\n"
-
-#: g10/keygen.c:1447
-#, fuzzy
-msgid "Are you sure that you want this keysize? (y/N) "
-msgstr "Weet u zeker dat u deze sleutelgrootte wilt? "
+#: g10/keygen.c:1539
+#, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "Welke sleutellengte wilt u? (%u) "
 
-#: g10/keygen.c:1449
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
-msgstr ""
-"Goed, maar houd er rekening mee dat de straling van uw beeldscherm en "
-"toetsenbord ook erg gevoelig zijn voor aanvallen!\n"
+#: g10/keygen.c:1553
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr "%s sleutels moeten tussen %u en %u bits lang zijn\n"
 
-#: g10/keygen.c:1458
+#: g10/keygen.c:1559
 #, c-format
 msgid "Requested keysize is %u bits\n"
-msgstr "Gevraagde sleutelgrootte is %u bits\n"
+msgstr "Gevraagde sleutellengte is %u bits\n"
 
-#: g10/keygen.c:1461 g10/keygen.c:1465
+#: g10/keygen.c:1564 g10/keygen.c:1569
 #, c-format
 msgid "rounded up to %u bits\n"
-msgstr "afgerond naar boven tot %u bits\n"
+msgstr "afgerond naar %u bits\n"
 
-#: g10/keygen.c:1516
+#: g10/keygen.c:1618
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3781,14 +4000,14 @@ msgid ""
 "      <n>m = key expires in n months\n"
 "      <n>y = key expires in n years\n"
 msgstr ""
-"Geef alstublieft aan hoe lang de sleutel geldig moet zijn.\n"
-"         0 = sleutel verloopt niet\n"
+"Geef aan hoe lang de sleutel geldig moet zijn.\n"
+"         0 = sleutel verloopt nooit\n"
 "      <n>  = sleutel verloopt na n dagen\n"
 "      <n>w = sleutel verloopt na n weken\n"
 "      <n>m = sleutel verloopt na n maanden\n"
-"      <n>y = sleutel verloopt na n jaren\n"
+"      <n>y = sleutel verloopt na n jaar\n"
 
-#: g10/keygen.c:1525
+#: g10/keygen.c:1629
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3797,50 +4016,58 @@ msgid ""
 "      <n>m = signature expires in n months\n"
 "      <n>y = signature expires in n years\n"
 msgstr ""
-"Geef alstublieft aan hoe lang de ondertekening geldig moet zijn.\n"
-"         0 = ondertekening verloopt niet\n"
+"Geef aan hoe lang de ondertekening geldig moet zijn.\n"
+"         0 = ondertekening verloopt nooit\n"
 "      <n>  = ondertekening verloopt na n dagen\n"
 "      <n>w = ondertekening verloopt na n weken\n"
 "      <n>m = ondertekening verloopt na n maanden\n"
-"      <n>y = ondertekening verloopt na n jaren\n"
+"      <n>y = ondertekening verloopt na n jaar\n"
 
-#: g10/keygen.c:1547
+#: g10/keygen.c:1650
 msgid "Key is valid for? (0) "
-msgstr "Hoe lang is de sleutel geldig? (0) "
+msgstr "Is de sleutel geldig voor? (0) "
 
-#: g10/keygen.c:1549
-msgid "Signature is valid for? (0) "
-msgstr "Hoe lang is de ondertekening geldig? (0) "
+#: g10/keygen.c:1655
+#, c-format
+msgid "Signature is valid for? (%s) "
+msgstr "Is de ondertekening geldig voor? (%s) "
 
-#: g10/keygen.c:1554
+#: g10/keygen.c:1673
 msgid "invalid value\n"
 msgstr "ongeldige waarde\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1680
+msgid "Key does not expire at all\n"
+msgstr "Sleutel verloopt niet\n"
+
+#: g10/keygen.c:1681
+msgid "Signature does not expire at all\n"
+msgstr "Ondertekening verloopt niet\n"
+
+#: g10/keygen.c:1686
 #, c-format
-msgid "%s does not expire at all\n"
-msgstr "%s verloopt nooit\n"
+msgid "Key expires at %s\n"
+msgstr "Sleutel is verlopen na %s\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1687
 #, c-format
-msgid "%s expires at %s\n"
-msgstr "%s verloopt op %s\n"
+msgid "Signature expires at %s\n"
+msgstr "Ondertekening is verlopen na %s\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1693
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
-"Uw systeem kan geen data weergeven na 2038.\n"
-"Het zal data echter correct verwerken tot 2106.\n"
+"Uw systeem kan geen datum weergeven na 2038.\n"
+"Het wordt echter wel juist afgehandeld tot 2106.\n"
 
-#: g10/keygen.c:1577
+#: g10/keygen.c:1698
 #, fuzzy
 msgid "Is this correct? (y/N) "
-msgstr "Is dit juist (j/n)? "
+msgstr "Is dit correct? (j/N) "
 
-#: g10/keygen.c:1620
-#, fuzzy
+#: g10/keygen.c:1713
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3850,935 +4077,940 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"U heeft een gebruikerscode nodig om de sleutel mee te identificeren;\n"
-"dit programma maakt een gebruikerscode van Echte naam, Opmerking\n"
-"en E-mail adres op de volgende manier:\n"
-"    \"Heinrich Heine (De dichter) <[email protected]>\"\n"
+"U moet een Gebruiker ID hebben om uw sleutel te identificeren, deze wordt "
+"gegenereerd\n"
+"op basis van de werkelijke naam, het commentaar, en het emailadres :\n"
+"    “Henri Koot (Directeur van het cijfer) <[email protected]>”\n"
 "\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1726
 msgid "Real name: "
-msgstr "Echte naam: "
+msgstr "Werkelijke naam: "
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1734
 msgid "Invalid character in name\n"
-msgstr "Ongeldig teken in naam\n"
+msgstr "Ongeldig teken in de naam\n"
 
-#: g10/keygen.c:1642
+#: g10/keygen.c:1736
 msgid "Name may not start with a digit\n"
 msgstr "Naam mag niet met een cijfer beginnen\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1738
 msgid "Name must be at least 5 characters long\n"
-msgstr "Naam moet tenminste 5 tekens lang zijn\n"
+msgstr "Naam moet minimaal 5 tekens lang zijn\n"
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1746
 msgid "Email address: "
-msgstr "E-mail adres: "
+msgstr "Email adres: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1752
 msgid "Not a valid email address\n"
-msgstr "Geen geldig e-mail adres\n"
+msgstr "Geen geldig email adres\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1760
 msgid "Comment: "
 msgstr "Opmerking: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1766
 msgid "Invalid character in comment\n"
-msgstr "Ongeldig teken in opmerking\n"
+msgstr "Ongeldig teken in het commentaar\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1789
 #, c-format
 msgid "You are using the `%s' character set.\n"
-msgstr "U gebruikt de `%s' tekenset.\n"
+msgstr "U gebruikt de ‘%s’ tekenreeks.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1795
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
 "    \"%s\"\n"
 "\n"
 msgstr ""
-"U heeft deze gebruikerscode gekozen:\n"
-"    \"%s\"\n"
+"U heeft de volgende Gebruiker ID gekozen:\n"
+"    “%s”\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1800
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
-"Stop het e-mail adres alstublieft niet in de echte naam of de opmerking\n"
-
-#: g10/keygen.c:1727
+"Plaats het email adres alstublieft niet in het Naam of Commentaar veld\n"
+
+#. TRANSLATORS: These are the allowed answers in
+#. lower and uppercase.  Below you will find the matching
+#. string which should be translated accordingly and the
+#. letter changed to match the one in the answer string.
+#.
+#. n = Change name
+#. c = Change comment
+#. e = Change email
+#. o = Okay (ready, continue)
+#. q = Quit
+#.
+#: g10/keygen.c:1816
 msgid "NnCcEeOoQq"
-msgstr "NnOoEeAaFf"
+msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1826
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
-msgstr "(N)aam, (C) opmerking, (E)-mail wijzigen of (Q) afsluiten? "
+msgstr "Verander (N)aam, (C)ommentaar, (E)mail of (S)toppen? "
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
-msgstr ""
-"(N)aam, (C) opmerking, (E)-mail wijzigen of (O) accepteren/(Q) afsluiten? "
+msgstr "Verander (N)aam, (C)ommentaar, (E)mail of (O)kay/(S)toppen? "
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1846
 msgid "Please correct the error first\n"
-msgstr "Verbeter de fout alstublieft eerst\n"
+msgstr "Verbeter eerst de fout\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1886
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
-"U heeft een wachtwoord nodig om uw geheime sleutel mee te beschermen.\n"
+"U moet een geheime zin opgeven om uw geheime sleutel te beschermen.\n"
 "\n"
 
-#: g10/keygen.c:1807
+#: g10/keygen.c:1896 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1902
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
 "using this program with the option \"--edit-key\".\n"
 "\n"
 msgstr ""
-"U wilt geen wachtwoord - dit is waarschijnlijk een *slecht* idee!\n"
-"Toch zal ik het doen.  U kunt uw wachtwoord altijd veranderen,\n"
-"met dit programma met de optie \"--edit-key\".\n"
+"U heeft geen geheime zin - dit is waarschijnlijk een slecht idee!\n"
+"I ga het toch doe, maar u kunt uw geheime zin later toevoegen,\n"
+"gebruik hiervoor de optie “--edit-key”.\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1924
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
 "disks) during the prime generation; this gives the random number\n"
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
-"Voor het genereren hebben we veel willekeurige bytes nodig. Het is een\n"
-"goed idee om wat te doen (iets typen met het toetsenbord, de muis\n"
-"bewegen, schijven gebruiken) tijdens het genereren van priemgetallen;\n"
-"dit geeft de willekeurige getallen generator een betere kans om genoeg\n"
-"entropie te verzamelen.\n"
-
-#: g10/keygen.c:2490
-msgid "DSA keypair will have 1024 bits.\n"
-msgstr "DSA sleutelpaar zal 1024 bits hebben.\n"
+"Er moet veel willekeurige informatie worden gemaakt. Het wordt beter als u\n"
+"nu even iets anders gaat doen op de computer (met de muis of harde schijf)\n"
+"terwijl dit gebeurd, hierdoor ontstaat meer gewenste willekeur.\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2722
 msgid "Key generation canceled.\n"
-msgstr "Sleutelaanmaak geannuleerd.\n"
+msgstr "Het aanmaken van de sleutel is onderbroken.\n"
 
-#: g10/keygen.c:2747 g10/keygen.c:2884
+#: g10/keygen.c:2921 g10/keygen.c:3068
 #, c-format
 msgid "writing public key to `%s'\n"
-msgstr "bezig met schrijven openbare sleutel naar `%s'\n"
+msgstr "Publieke sleutel wordt opgeslagen in ‘%s’\n"
 
-#: g10/keygen.c:2749 g10/keygen.c:2887
-#, fuzzy, c-format
+#: g10/keygen.c:2923 g10/keygen.c:3071
+#, c-format
 msgid "writing secret key stub to `%s'\n"
-msgstr "bezig met schrijven geheime sleutel naar `%s'\n"
+msgstr "Geheime sleutel verwijzing wordt opgeslagen in ‘%s’\n"
 
-#: g10/keygen.c:2752 g10/keygen.c:2890
+#: g10/keygen.c:2926 g10/keygen.c:3074
 #, c-format
 msgid "writing secret key to `%s'\n"
-msgstr "bezig met schrijven geheime sleutel naar `%s'\n"
+msgstr "Geheime sleutel wordt opgeslagen in ‘%s’\n"
 
-#: g10/keygen.c:2873
+#: g10/keygen.c:3057
 #, c-format
 msgid "no writable public keyring found: %s\n"
-msgstr "geen schrijfbare openbare sleutelbos gevonden: %s\n"
+msgstr "geen schrijfbare publieke sleutelring gevonden: %s\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:3063
 #, c-format
 msgid "no writable secret keyring found: %s\n"
-msgstr "geen schrijfbare geheime sleutelbos gevonden: %s\n"
+msgstr "geen schrijfbare geheime sleutelring gevonden: %s\n"
 
-#: g10/keygen.c:2897
+#: g10/keygen.c:3081
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
-msgstr "fout bij schrijven openbare sleutelbos `%s': %s\n"
+msgstr "schrijven publieke sleutelring ‘%s’ mislukt: %s\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:3088
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
-msgstr "fout bij schrijven geheime sleutelbos `%s': %s\n"
+msgstr "schrijven geheime sleutelring ‘%s’ mislukt: %s\n"
 
-#: g10/keygen.c:2927
+#: g10/keygen.c:3111
 msgid "public and secret key created and signed.\n"
-msgstr "openbare en geheime sleutel aangemaakt en ondertekend.\n"
+msgstr "publieke en geheime sleutel zijn aangemaakt en ondertekened.\n"
 
-#: g10/keygen.c:2938
+#: g10/keygen.c:3122
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
-"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
-"Let op dat deze sleutel niet gebruikt kan worden voor coderen.  Mogelijk\n"
-"wilt u daarvoor met de opdracht \"--edit-key\" een tweede sleutel aanmaken.\n"
+"Deze sleutel kan niet gebruikt worden voor versleuteling. U kunt hiervoor\n"
+"met het commando “--edit-key” een subsleutel aanmaken.\n"
 
-#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180
+#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
 #, c-format
 msgid "Key generation failed: %s\n"
-msgstr "Sleutelaanmaak mislukt: %s\n"
+msgstr "Sleutel aanmaken is mislukt: %s\n"
 
-#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
-"sleutel is %lu seconde in de toekomst aangemaakt (tijdsreis of "
-"klokprobleem)\n"
+"sleutel is %lu seconde in de toekomst gemaakt (tijd ruimte lus of problemen "
+"met de klok)\n"
 
-#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292
+#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
-"sleutel is %lu seconden in de toekomst aangemaakt (tijdsreis of "
-"klokprobleem)\n"
+"sleutel is %lu seconden in de toekomst gemaakt (tijd ruimte lus of problemen "
+"met de klok)\n"
 
-#: g10/keygen.c:3012 g10/keygen.c:3129
+#: g10/keygen.c:3197 g10/keygen.c:3326
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
-msgstr ""
-"LET OP: het aanmaken van deelsleutels voor v3-sleutels komt niet overeen met "
-"OpenPGP\n"
+msgstr "Noot: v3 subsleutels zijn niet toegestaan in de OpenPGP standaard\n"
 
-#: g10/keygen.c:3040 g10/keygen.c:3162
+#: g10/keygen.c:3236 g10/keygen.c:3359
 #, fuzzy
 msgid "Really create? (y/N) "
-msgstr "Echt aanmaken? "
+msgstr "Werkelijk aanmaken? (j/N) "
 
-#: g10/keygen.c:3315
-#, fuzzy, c-format
+#: g10/keygen.c:3524
+#, c-format
 msgid "storing key onto card failed: %s\n"
-msgstr "verwijderen sleutelblok mislukt: %s\n"
-
-#: g10/keygen.c:3362
-#, fuzzy, c-format
-msgid "can't create backup file `%s': %s\n"
-msgstr "kan `%s' niet aanmaken: %s\n"
-
-#: g10/keygen.c:3385
-#, fuzzy, c-format
-msgid "NOTE: backup of card key saved to `%s'\n"
-msgstr "LET OP: geheime sleutel %08lX verlopen op %s\n"
+msgstr "sleutel is niet op de kaart opgeslagen: %s\n"
 
-#: g10/keygen.c:3452
+#: g10/keygen.c:3571
 #, c-format
-msgid "length of RSA modulus is not %d\n"
-msgstr ""
-
-#: g10/keygen.c:3458
-msgid "public exponent too large (more than 32 bits)\n"
-msgstr ""
+msgid "can't create backup file `%s': %s\n"
+msgstr "kan reservebestand ‘%s’ niet maken: %s\n"
 
-#: g10/keygen.c:3464 g10/keygen.c:3470
+#: g10/keygen.c:3597
 #, c-format
-msgid "length of an RSA prime is not %d\n"
-msgstr ""
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "Noot: reserve bestand van de kaart sleutel opgeslagen als ‘%s’\n"
 
-#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
+#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
 msgid "never     "
-msgstr "nooit"
+msgstr "nooit     "
 
-#: g10/keylist.c:201
+#: g10/keylist.c:265
 msgid "Critical signature policy: "
-msgstr "Kritisch ondertekenbeleid: "
+msgstr "Kritieke ondertekeningsbeleid: "
 
-#: g10/keylist.c:203
+#: g10/keylist.c:267
 msgid "Signature policy: "
-msgstr "Ondertekenbeleid: "
+msgstr "ondertekeningsbeleid: "
 
-#: g10/keylist.c:242
+#: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
-msgstr ""
+msgstr "Kritieke voorkeurs sleutelserver: "
 
-#: g10/keylist.c:291 g10/keylist.c:335
-msgid "WARNING: invalid notation data found\n"
-msgstr "WAARSCHUWING: ongeldige notatiegegevens gevonden\n"
-
-#: g10/keylist.c:309
+#: g10/keylist.c:359
 msgid "Critical signature notation: "
-msgstr "Kritische ondertekennotatie: "
+msgstr "Kritieke ondertekening notitie: "
 
-#: g10/keylist.c:311
+#: g10/keylist.c:361
 msgid "Signature notation: "
-msgstr "Ondertekennotatie: "
-
-#: g10/keylist.c:322
-msgid "not human readable"
-msgstr "niet leesbaar voor mensen"
+msgstr "Ondertekening notitie: "
 
-#: g10/keylist.c:423
+#: g10/keylist.c:471
 msgid "Keyring"
-msgstr "Sleutelbos"
+msgstr "Sleutelring"
 
-#: g10/keylist.c:729
-#, fuzzy, c-format
-msgid "expired: %s)"
-msgstr " [verloopt: %s]"
-
-#: g10/keylist.c:1431
+#: g10/keylist.c:1505
 msgid "Primary key fingerprint:"
-msgstr "Vingerafdruk primaire sleutel:"
+msgstr "Vingerafdruk van de primaire sleutel:"
 
-#: g10/keylist.c:1433
+#: g10/keylist.c:1507
 msgid "     Subkey fingerprint:"
-msgstr "     Vingerafdruk deelsleutel:"
+msgstr "      Vingerafdruk van de Sub-Sleutel:"
 
-#: g10/keylist.c:1440
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1514
 msgid " Primary key fingerprint:"
-msgstr " Vingerafdruk primaire sleutel:"
+msgstr " Vingerafdruk van de primaire sleutel:"
 
-#: g10/keylist.c:1442
+#: g10/keylist.c:1516
 msgid "      Subkey fingerprint:"
-msgstr "      Vingerafdruk deelsleutel:"
+msgstr "      Vingerafdruk van de Sub-Sleutel:"
 
-#: g10/keylist.c:1446 g10/keylist.c:1450
-#, fuzzy
+#: g10/keylist.c:1520 g10/keylist.c:1524
 msgid "      Key fingerprint ="
-msgstr "     Vingerafdruk sleutel ="
+msgstr "      Vingerafdruk van de Sleutel ="
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1591
 msgid "      Card serial no. ="
-msgstr ""
+msgstr "         Serienummer van de kaart ="
 
-#: g10/keyring.c:1245
-#, fuzzy, c-format
+#: g10/keyring.c:1246
+#, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
-msgstr "bepantseren mislukt: %s\n"
+msgstr "hernoemen van ‘%s’ naar ‘%s’ is mislukt: %s\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1252
 msgid "WARNING: 2 files with confidential information exists.\n"
-msgstr "WAARSCHUWING: 2 bestanden met vertrouwelijke informatie bestaan.\n"
+msgstr "Waarschuwing: er zijn twee bestanden met vertrouwlijke informatie.\n"
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s is de ongewijzigde\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1255
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s is de nieuwe\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1256
 msgid "Please fix this possible security flaw\n"
-msgstr "Repareer alstublieft dit mogelijke veiligheidsrisico\n"
+msgstr "Los dit beveiligingsprobleem alstublieft op\n"
 
-#: g10/keyring.c:1375
-#, fuzzy, c-format
+#: g10/keyring.c:1376
+#, c-format
 msgid "caching keyring `%s'\n"
-msgstr "bezig met controleren sleutelbos `%s'\n"
+msgstr "inlezen sleutelring ‘%s’\n"
 
-#: g10/keyring.c:1421
-#, fuzzy, c-format
+#: g10/keyring.c:1422
+#, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
-msgstr "%lu sleutels gecontroleerd (%lu ondertekeningen)\n"
+msgstr "%lu sleutels tot nu toe ingelezen (%lu ondertekeningen)\n"
 
-#: g10/keyring.c:1433
-#, fuzzy, c-format
+#: g10/keyring.c:1434
+#, c-format
 msgid "%lu keys cached (%lu signatures)\n"
-msgstr "%lu sleutels gecontroleerd (%lu ondertekeningen)\n"
+msgstr "%lu sleutels ingelezen (%lu ondertekeningen)\n"
 
-#: g10/keyring.c:1504
+#: g10/keyring.c:1505
 #, c-format
 msgid "%s: keyring created\n"
-msgstr "%s: sleutelbos aangemaakt\n"
+msgstr "%s: sleutelring aangemaakt\n"
+
+#: g10/keyserver.c:61
+msgid "include revoked keys in search results"
+msgstr "toon ook ingetrokken sleutels"
+
+#: g10/keyserver.c:62
+msgid "include subkeys when searching by key ID"
+msgstr "zoek ook op sub-sleutels als een sleutel ID wordt gezocht"
+
+#: g10/keyserver.c:64
+msgid "use temporary files to pass data to keyserver helpers"
+msgstr ""
+"gebruik tijdelijke bestanden om gegevens naar de sleutelsever te sturen"
+
+#: g10/keyserver.c:66
+msgid "do not delete temporary files after using them"
+msgstr "tijdelijke bestanden laten staan na gebruik"
+
+#: g10/keyserver.c:70
+msgid "automatically retrieve keys when verifying signatures"
+msgstr "Sleutels automatische ophalen bij het controleren van ondertekeningen"
+
+#: g10/keyserver.c:72
+msgid "honor the preferred keyserver URL set on the key"
+msgstr "gebruik de voorkeur sleutelserver zoals vermeld bij de sleutel"
 
-#: g10/keyserver.c:98
-#, fuzzy, c-format
+#: g10/keyserver.c:74
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr "gebruik het de PKA informatie bij het ophalen van de sleutel"
+
+#: g10/keyserver.c:140
+#, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
-"WAARSCHUWING: opties in `%s' zijn tijdens deze sessie nog niet actief\n"
+"Waarschuwing: sleutelserver optie '%s' is niet geldig op dit platform\n"
 
-#: g10/keyserver.c:378
-#, fuzzy
+#: g10/keyserver.c:523
 msgid "disabled"
-msgstr "disable"
+msgstr "uitgeschakeld"
 
-#: g10/keyserver.c:579
+#: g10/keyserver.c:724
 msgid "Enter number(s), N)ext, or Q)uit > "
-msgstr ""
+msgstr "Geef getallen, Volgende(N) , of Stoppen(Q) > "
 
-#: g10/keyserver.c:662 g10/keyserver.c:1142
-#, fuzzy, c-format
+#: g10/keyserver.c:808 g10/keyserver.c:1426
+#, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
-msgstr "ongeldige uitvoeropties\n"
+msgstr "ongeldig sleutelserver protocol (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:752
-#, fuzzy, c-format
+#: g10/keyserver.c:906
+#, c-format
 msgid "key \"%s\" not found on keyserver\n"
-msgstr "sleutel `%s' niet gevonden: %s\n"
+msgstr "sleutel '%s' niet gevonden op de sleutelserver\n"
 
-#: g10/keyserver.c:754
-#, fuzzy
+#: g10/keyserver.c:908
 msgid "key not found on keyserver\n"
-msgstr "sleutel `%s' niet gevonden: %s\n"
+msgstr "sleutel niet gevonden op de sleutelserver\n"
 
-#: g10/keyserver.c:896
-#, fuzzy, c-format
+#: g10/keyserver.c:1145
+#, c-format
 msgid "requesting key %s from %s server %s\n"
-msgstr "bezig met opvragen sleutel %08lX van %s\n"
+msgstr "opvragen sleutel %s van %s sleutelserver %s\n"
 
-#: g10/keyserver.c:900
-#, fuzzy, c-format
+#: g10/keyserver.c:1149
+#, c-format
 msgid "requesting key %s from %s\n"
-msgstr "bezig met opvragen sleutel %08lX van %s\n"
+msgstr "opvragen sleutel %s van %s\n"
 
-#: g10/keyserver.c:1045
-#, fuzzy, c-format
+#: g10/keyserver.c:1173
+#, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "namen zoeken van %s server %s\n"
+
+#: g10/keyserver.c:1176
+#, c-format
+msgid "searching for names from %s\n"
+msgstr "namen zoeken van %s\n"
+
+#: g10/keyserver.c:1329
+#, c-format
 msgid "sending key %s to %s server %s\n"
-msgstr "bezig met zoeken naar \"%s\" bij HKP-server %s\n"
+msgstr "versturen van sleutel %s naar %s server %s\n"
 
-#: g10/keyserver.c:1049
-#, fuzzy, c-format
+#: g10/keyserver.c:1333
+#, c-format
 msgid "sending key %s to %s\n"
-msgstr ""
-"\"\n"
-"ondertekend met uw sleutel %08lX op %s\n"
+msgstr "versturen van sleutel %s naar %s\n"
 
-#: g10/keyserver.c:1092
-#, fuzzy, c-format
+#: g10/keyserver.c:1376
+#, c-format
 msgid "searching for \"%s\" from %s server %s\n"
-msgstr "bezig met zoeken naar \"%s\" bij HKP-server %s\n"
+msgstr "zoeken naar '%s' van de %s server %s\n"
 
-#: g10/keyserver.c:1095
-#, fuzzy, c-format
+#: g10/keyserver.c:1379
+#, c-format
 msgid "searching for \"%s\" from %s\n"
-msgstr "bezig met zoeken naar \"%s\" bij HKP-server %s\n"
+msgstr "zoeken naar '%s' van de %s\n"
 
-#: g10/keyserver.c:1102 g10/keyserver.c:1197
-#, fuzzy
+#: g10/keyserver.c:1386 g10/keyserver.c:1482
 msgid "no keyserver action!\n"
-msgstr "ongeldige uitvoeropties\n"
+msgstr "geen sleutelserver actie!\n"
 
-#: g10/keyserver.c:1150
+#: g10/keyserver.c:1434
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
-msgstr ""
+msgstr "Waarschuwing: sleutelserver code is van een andere GnuPG versie (%s)\n"
 
-#: g10/keyserver.c:1159
+#: g10/keyserver.c:1443
 msgid "keyserver did not send VERSION\n"
-msgstr ""
+msgstr "sleutelserver verstuurde geen versie informatie\n"
 
-#: g10/keyserver.c:1218
+#: g10/keyserver.c:1505 g10/keyserver.c:2033
 msgid "no keyserver known (use option --keyserver)\n"
-msgstr ""
+msgstr "er is geen sleutelserver bekend (gebruik commando --keyserver)\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1511
 msgid "external keyserver calls are not supported in this build\n"
-msgstr ""
+msgstr "externe sleutelservers zijn niet beschikbaar in deze versie\n"
 
-#: g10/keyserver.c:1236
+#: g10/keyserver.c:1523
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
-msgstr ""
+msgstr "geen afhandeling mogelijk van sleutelserver configuratie ‘%s’\n"
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1528
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
+"de actie ‘%s’ is niet ondersteund in de sleutelserver configuratie ‘%s’\n"
 
-#: g10/keyserver.c:1249
+#: g10/keyserver.c:1536
 #, c-format
-msgid "gpgkeys_%s does not support handler version %d\n"
-msgstr ""
+msgid "%s does not support handler version %d\n"
+msgstr "%s ondersteund de code met versie %d niet\n"
 
-#: g10/keyserver.c:1254
-#, fuzzy
+#: g10/keyserver.c:1543
 msgid "keyserver timed out\n"
-msgstr "sleutelserverfout"
+msgstr "sleutelserver reageert te langzaam\n"
 
-#: g10/keyserver.c:1259
-#, fuzzy
+#: g10/keyserver.c:1548
 msgid "keyserver internal error\n"
-msgstr "sleutelserverfout"
+msgstr "sleutelserver geeft een interne fout\n"
 
-#: g10/keyserver.c:1268
-#, fuzzy, c-format
+#: g10/keyserver.c:1557
+#, c-format
 msgid "keyserver communications error: %s\n"
-msgstr "Sleutelaanmaak mislukt: %s\n"
+msgstr "communicatie fout met de sleutelserver: %s\n"
 
-#: g10/keyserver.c:1293 g10/keyserver.c:1327
+#: g10/keyserver.c:1582 g10/keyserver.c:1616
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
-msgstr ""
+msgstr "“%s” is geen sleutel ID: overgeslagen\n"
 
-#: g10/keyserver.c:1578
-#, fuzzy, c-format
+#: g10/keyserver.c:1875
+#, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
-msgstr "WAARSCHUWING: kan tijdelijke bestand (%s) `%s' niet verwijderen: %s\n"
+msgstr ""
+"Waarschuwing: het is niet mogelijk sleutel %s via %s te verversen: %s\n"
 
-#: g10/keyserver.c:1600
-#, fuzzy, c-format
+#: g10/keyserver.c:1897
+#, c-format
 msgid "refreshing 1 key from %s\n"
-msgstr "bezig met opvragen sleutel %08lX van %s\n"
+msgstr "1 sleutel ververst vanuit %s\n"
 
-#: g10/keyserver.c:1602
-#, fuzzy, c-format
+#: g10/keyserver.c:1899
+#, c-format
 msgid "refreshing %d keys from %s\n"
-msgstr "bezig met opvragen sleutel %08lX van %s\n"
+msgstr "%d sleutels ververst vanuit %s\n"
 
-#: g10/mainproc.c:248
+#: g10/keyserver.c:1955
 #, c-format
-msgid "weird size for an encrypted session key (%d)\n"
-msgstr "vreemde grootte voor een gecodeerde sessiesleutel (%d)\n"
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "Waarschuwing: het is niet mogelijk de URI %s te benaderen: %s\n"
 
-#: g10/mainproc.c:262
-#, fuzzy, c-format
-msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "onbekend codeeralgoritme"
+#: g10/keyserver.c:1961
+#, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr "Waarschuwing: leesfout in URI %s\n"
 
-#: g10/mainproc.c:299
-#, fuzzy, c-format
+#: g10/mainproc.c:239
+#, c-format
+msgid "weird size for an encrypted session key (%d)\n"
+msgstr "vreemde lengte van een versleutelde sessie sleutel (%d)\n"
+
+#: g10/mainproc.c:290
+#, c-format
 msgid "%s encrypted session key\n"
-msgstr "vreemde grootte voor een gecodeerde sessiesleutel (%d)\n"
+msgstr "%s versleutelde sessie sleutel\n"
 
-#: g10/mainproc.c:309
-#, fuzzy, c-format
+#: g10/mainproc.c:300
+#, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
-msgstr "gecodeerd met onbekend algoritme %d\n"
+msgstr "geheime zin is gemaakt met onbekend samenvattings algoritme %d\n"
 
-#: g10/mainproc.c:373
-#, fuzzy, c-format
+#: g10/mainproc.c:381
+#, c-format
 msgid "public key is %s\n"
-msgstr "openbare sleutel is %08lX\n"
+msgstr "publieke sleutel is %s\n"
 
-#: g10/mainproc.c:428
+#: g10/mainproc.c:438
 msgid "public key encrypted data: good DEK\n"
-msgstr "openbare sleutel gecodeerde gegevens: goede DEK\n"
+msgstr "publieke sleutel versleutelde gegevens: juiste DEK\n"
 
-#: g10/mainproc.c:461
-#, fuzzy, c-format
+#: g10/mainproc.c:471
+#, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
-msgstr "gecodeerd met %u-bit %s sleutel, ID %08lX, aangemaakt op %s\n"
+msgstr "versleutel met %u-bit %s sleutel, ID %s, gemaakt %s\n"
 
-#: g10/mainproc.c:465 g10/pkclist.c:218
-#, fuzzy, c-format
+#: g10/mainproc.c:475 g10/pkclist.c:219
+#, c-format
 msgid "      \"%s\"\n"
-msgstr "                alias \""
+msgstr "      “%s”\n"
 
-#: g10/mainproc.c:469
-#, fuzzy, c-format
+#: g10/mainproc.c:479
+#, c-format
 msgid "encrypted with %s key, ID %s\n"
-msgstr "gecodeerd met %s sleutel, ID %08lX\n"
+msgstr "versleuteld met %s sleutel, ID %s\n"
 
-#: g10/mainproc.c:483
+#: g10/mainproc.c:493
 #, c-format
 msgid "public key decryption failed: %s\n"
-msgstr "openbare sleutel decodering mislukt: %s\n"
+msgstr "publieke sleutel decodering is mislukt : %s\n"
 
-#: g10/mainproc.c:497
-#, fuzzy, c-format
+#: g10/mainproc.c:507
+#, c-format
 msgid "encrypted with %lu passphrases\n"
-msgstr "Herhaal wachtwoord\n"
+msgstr "versleuteld met %lu geheime zinnen\n"
 
-#: g10/mainproc.c:499
-#, fuzzy
+#: g10/mainproc.c:509
 msgid "encrypted with 1 passphrase\n"
-msgstr "Herhaal wachtwoord\n"
+msgstr "versleuteld met 1 geheime zin\n"
 
-#: g10/mainproc.c:527 g10/mainproc.c:549
+#: g10/mainproc.c:540 g10/mainproc.c:562
 #, c-format
 msgid "assuming %s encrypted data\n"
-msgstr "er wordt aangenomen dat het om %s-gecodeerde gegevens gaat\n"
+msgstr "waarschijnlijk %s versleutelde gegevens\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:548
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
-"IDEA-codering niet beschikbaar; er wordt optimistisch in plaats daarvan %s "
-"te gebruiken\n"
+"IDEA versleutelalgoritme is niet beschikbaar, maar we gaan met goede moed %s "
+"proberen\n"
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:580
 msgid "decryption okay\n"
-msgstr "decodering goed\n"
+msgstr "decodering ok\n"
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:584
 msgid "WARNING: message was not integrity protected\n"
-msgstr "WAARSCHUWING: bericht integriteit was niet beschermd\n"
+msgstr "Waarschuwing: bericht was niet beschermd\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:597
 msgid "WARNING: encrypted message has been manipulated!\n"
-msgstr "WAARSCHUWING: het gecodeerde bericht is gemanipuleerd!\n"
+msgstr "Waarschuwing: versleuteld bericht is aangepast!\n"
 
-#: g10/mainproc.c:590
+#: g10/mainproc.c:603
 #, c-format
 msgid "decryption failed: %s\n"
-msgstr "decodering mislukt: %s\n"
+msgstr "decoderen mislukt: %s\n"
 
-#: g10/mainproc.c:610
+#: g10/mainproc.c:624
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
-msgstr "LET OP: verzender heeft gevraagd om \"alleen-voor-uw-ogen\"\n"
+msgstr "Noot: verzender heeft “Alleen-voor-Uw-ogen” verzocht\n"
 
-#: g10/mainproc.c:612
+#: g10/mainproc.c:626
 #, c-format
 msgid "original file name='%.*s'\n"
-msgstr "oorspronkelijke bestandsnaam='%.*s'\n"
+msgstr "originele bestandsnaam='%.*s'\n"
+
+#: g10/mainproc.c:711
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr ""
 
-#: g10/mainproc.c:784
+#: g10/mainproc.c:839
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
-msgstr "losstaande herroeping - gebruik \"gpg --import\" om toe te passen\n"
+msgstr ""
+"alleenstaande opheffing - gebruik “gpg --import” om deze toe te passen\n"
+
+#: g10/mainproc.c:1187
+msgid "no signature found\n"
+msgstr "geen ondertekening gevonden\n"
 
-#: g10/mainproc.c:1288
+#: g10/mainproc.c:1430
 msgid "signature verification suppressed\n"
-msgstr "verificatie van ondertekening onderdrukt\n"
+msgstr "ondertekening controle onderdrukt\n"
 
-#: g10/mainproc.c:1330 g10/mainproc.c:1340
-msgid "can't handle these multiple signatures\n"
-msgstr "kan deze meervoudige ondertekeningen niet verwerken\n"
+#: g10/mainproc.c:1539
+msgid "can't handle this ambiguous signature data\n"
+msgstr "kan onduidelijke onderteken gegevens niet verwerken\n"
 
-#: g10/mainproc.c:1350
-#, fuzzy, c-format
+#: g10/mainproc.c:1550
+#, c-format
 msgid "Signature made %s\n"
-msgstr "Ondertekening verlopen %s\n"
+msgstr "Ondertekening gemaakt %s\n"
 
-#: g10/mainproc.c:1351
-#, fuzzy, c-format
+#: g10/mainproc.c:1551
+#, c-format
 msgid "               using %s key %s\n"
-msgstr "                alias \""
+msgstr "               %s sleutel gebruikt %s\n"
 
-#: g10/mainproc.c:1355
-#, fuzzy, c-format
+#: g10/mainproc.c:1555
+#, c-format
 msgid "Signature made %s using %s key ID %s\n"
-msgstr "Ondertekening gemaakt op %.*s met %s sleutel ID %08lX\n"
+msgstr "Ondertekening heeft %s gemaakt met %s sleutel ID %s\n"
 
-#: g10/mainproc.c:1375
-#, fuzzy
+#: g10/mainproc.c:1575
 msgid "Key available at: "
-msgstr "Geen hulp beschikbaar"
+msgstr "Sleutel beschikbaar vanaf: "
 
-#: g10/mainproc.c:1480 g10/mainproc.c:1528
-#, fuzzy, c-format
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#, c-format
 msgid "BAD signature from \"%s\""
-msgstr "SLECHTE ondertekening van \""
+msgstr "Slechte ondertekening van “%s”"
 
-#: g10/mainproc.c:1482 g10/mainproc.c:1530
-#, fuzzy, c-format
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#, c-format
 msgid "Expired signature from \"%s\""
-msgstr "Verlopen ondertekening van \""
+msgstr "Verlopen ondertekening van “%s”"
 
-#: g10/mainproc.c:1484 g10/mainproc.c:1532
-#, fuzzy, c-format
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#, c-format
 msgid "Good signature from \"%s\""
-msgstr "Goede ondertekening van \""
+msgstr "Goede ondertekening van “%s”"
 
-#: g10/mainproc.c:1536
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr "[onzeker]"
 
-#: g10/mainproc.c:1568
-#, fuzzy, c-format
+#: g10/mainproc.c:1797
+#, c-format
 msgid "                aka \"%s\""
-msgstr "                alias \""
+msgstr "                ook bekend als “%s”"
 
-#: g10/mainproc.c:1662
+#: g10/mainproc.c:1895
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Ondertekening verlopen %s\n"
 
-#: g10/mainproc.c:1667
+#: g10/mainproc.c:1900
 #, c-format
 msgid "Signature expires %s\n"
-msgstr "Ondertekening verloopt %s\n"
+msgstr "Ondertekening verloopt op %s\n"
 
-#: g10/mainproc.c:1670
+#: g10/mainproc.c:1903
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
-msgstr "%s ondertekeing, digest-algoritme %s\n"
+msgstr "%s ondertekeningen, samenvattings algoritme %s\n"
 
-#: g10/mainproc.c:1671
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr "binair"
 
-#: g10/mainproc.c:1672
+#: g10/mainproc.c:1905
 msgid "textmode"
-msgstr "tekstmodus"
+msgstr "tekst"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:499
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 msgid "unknown"
 msgstr "onbekend"
 
-#: g10/mainproc.c:1692
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ondertekening niet controleren: %s\n"
 
-#: g10/mainproc.c:1760 g10/mainproc.c:1776 g10/mainproc.c:1862
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
-msgstr "geen losgekoppelde ondertekening\n"
+msgstr "geen ontkoppelde ondertekening\n"
 
-#: g10/mainproc.c:1803
+#: g10/mainproc.c:2037
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
-"WAARSCHUWING: meerdere ondertekeningen gevonden.  Alleen de eerste wordt "
+"Waarschuwing: meerdere ondertekeningen gevonden.  Alleen de eerste wordt "
 "gecontroleerd.\n"
 
-#: g10/mainproc.c:1811
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
-msgstr "losstaande ondertekening van klasse 0x%02x\n"
+msgstr "alleenstaande onderteklening van klasse 0x%02x\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
-msgstr "oude stijl (PGP 2.x) ondertekening\n"
+msgstr "PGP 2.x ondertekening\n"
 
-#: g10/mainproc.c:1878
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
-msgstr "ongeldig root-pakket gevonden in proc_tree()\n"
+msgstr "ongeldig stam pakket gevonden in proc_tree()\n"
 
-#: g10/misc.c:101
+#: g10/misc.c:122
 #, c-format
 msgid "can't disable core dumps: %s\n"
-msgstr "kan geheugendumps niet uit zetten: %s\n"
+msgstr "het is niet mogelijk 'core dumps' uitschakelen: %s\n"
 
-#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221
-#, fuzzy, c-format
+#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
-msgstr "kan bestand niet openen: %s\n"
+msgstr "fstat of ‘%s’ failed in %s: %s\n"
 
-#: g10/misc.c:186
-#, fuzzy, c-format
+#: g10/misc.c:207
+#, c-format
 msgid "fstat(%d) failed in %s: %s\n"
-msgstr "trustdb: lezen mislukt (n=%d): %s\n"
+msgstr "fstat(%d) mislukt in %s: %s\n"
 
-#: g10/misc.c:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr "Experimentele algoritme moeten niet worden gebruikt!\n"
+#: g10/misc.c:316
+#, c-format
+msgid "WARNING: using experimental public key algorithm %s\n"
+msgstr ""
+"Waarschuwing: U gebruikt een expirimenteel algoritme voor publieke sleutel %"
+"s\n"
+
+#: g10/misc.c:331
+#, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "Waarschuwing: U gebruikt een expirimenteel versleutel algoritme %s\n"
 
-#: g10/misc.c:324
-msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
+#: g10/misc.c:346
+#, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr ""
-"dit coderingsalgoritme wordt afgeraden; gebruik alstublieft een wat "
-"normalere!\n"
+"Waarschuwing: U gebruikt een expirimenteel samenvattings algoritme %s\n"
+
+#: g10/misc.c:351
+#, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "Waarschuwing: samenvattings algoritme %s wordt afgeraden\n"
 
-#: g10/misc.c:430
+#: g10/misc.c:447
 msgid "the IDEA cipher plugin is not present\n"
-msgstr "de IDEA-coderingsplug-in is niet aanwezig\n"
+msgstr "het IDEA versleutelalgoritme is niet beschikbaar\n"
 
-#: g10/misc.c:431
-msgid ""
-"please see http://www.gnupg.org/why-not-idea.html for more information\n"
-msgstr ""
-"zie alstublieft http://www.gnupg.org/why-not-idea.html voor meer informatie\n"
+#: g10/misc.c:448 g10/sig-check.c:103
+#, c-format
+msgid "please see %s for more information\n"
+msgstr "lees %s voor meer informatie\n"
 
-#: g10/misc.c:664
+#: g10/misc.c:681
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
-msgstr "%s:%d: afgeraden optie \"%s\"\n"
+msgstr "%s:%d: afgeraden optie “%s”\n"
 
-#: g10/misc.c:668
+#: g10/misc.c:685
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "WAARSCHUWING: \"%s\" is een afgeraden optie\n"
+msgstr "Waarschuwing: “%s” is een afgeraden optie\n"
 
-#: g10/misc.c:670
+#: g10/misc.c:687
 #, c-format
 msgid "please use \"%s%s\" instead\n"
-msgstr "gebruik alstublieft \"%s%s\"\n"
+msgstr "U kunt beter “%s%s” gebruiken\n"
 
-#: g10/misc.c:681
-#, fuzzy
+#: g10/misc.c:694
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "Waarschuwing: “%s” is een afgeraden comando - gebruik het niet\n"
+
+#: g10/misc.c:707
 msgid "Uncompressed"
-msgstr "niet verwerkt"
+msgstr "Ongecomprimeerd"
 
-#: g10/misc.c:706
-#, fuzzy
+#: g10/misc.c:732
 msgid "uncompressed|none"
-msgstr "niet verwerkt"
+msgstr "ongecomprimeerd|geen"
 
-#: g10/misc.c:816
+#: g10/misc.c:842
 #, c-format
 msgid "this message may not be usable by %s\n"
-msgstr "dit bericht is mogelijk niet bruikbaar voor %s\n"
+msgstr "dit bericht kan mogelijk niet gebruikt worden door %s\n"
 
-#: g10/misc.c:973
-#, fuzzy, c-format
+#: g10/misc.c:1017
+#, c-format
 msgid "ambiguous option `%s'\n"
-msgstr "bezig met lezen opties uit `%s'\n"
+msgstr "dubbelzinnige optie ‘%s’\n"
 
-#: g10/misc.c:998
-#, fuzzy, c-format
+#: g10/misc.c:1042
+#, c-format
 msgid "unknown option `%s'\n"
-msgstr "onbekende standaard ontvanger `%s'\n"
+msgstr "onbekende optie ‘%s’\n"
 
-#: g10/openfile.c:84
+#: g10/openfile.c:86
 #, c-format
 msgid "File `%s' exists. "
-msgstr "Bestand `%s' bestaat. "
+msgstr "Bestand ‘%s’ bestaat. "
 
-#: g10/openfile.c:86
+#: g10/openfile.c:90
 #, fuzzy
 msgid "Overwrite? (y/N) "
-msgstr "Overschrijven (j/N)? "
+msgstr "Overschrijven? (j/N) "
 
-#: g10/openfile.c:119
+#: g10/openfile.c:123
 #, c-format
 msgid "%s: unknown suffix\n"
-msgstr "%s: onbekend achtervoegsel\n"
+msgstr "%s: onbekende toevoeging\n"
 
-#: g10/openfile.c:141
+#: g10/openfile.c:145
 msgid "Enter new filename"
 msgstr "Geef nieuwe bestandsnaam"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:190
 msgid "writing to stdout\n"
-msgstr "bezig met schrijven naar standaard uitvoer\n"
+msgstr "schrijven naar standaarduitvoer\n"
 
-#: g10/openfile.c:296
+#: g10/openfile.c:311
 #, c-format
 msgid "assuming signed data in `%s'\n"
-msgstr "er wordt aangenomen dat het in `%s' om ondertekende gegevens gaat\n"
+msgstr "ondertekende gegevens verwacht in ‘%s’\n"
 
-#: g10/openfile.c:375
+#: g10/openfile.c:390
 #, c-format
 msgid "new configuration file `%s' created\n"
-msgstr "nieuw configuratiebestand `%s' aangemaakt\n"
+msgstr "nieuw configuratie bestand ‘%s’ gemaakt\n"
 
-#: g10/openfile.c:377
+#: g10/openfile.c:392
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
-msgstr ""
-"WAARSCHUWING: opties in `%s' zijn tijdens deze sessie nog niet actief\n"
+msgstr "Waarschuwing: opties in ‘%s’ zijn nu nog niet actief\n"
 
-#: g10/openfile.c:409
-#, fuzzy, c-format
+#: g10/openfile.c:424
+#, c-format
 msgid "directory `%s' created\n"
-msgstr "%s: map aangemaakt\n"
+msgstr "map ‘%s’ aangemaakt\n"
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:143
 #, c-format
 msgid "can't handle public key algorithm %d\n"
-msgstr "kan openbare sleutel algoritme %d niet behandelen\n"
+msgstr "kan publieke sleutel algoritme %d niet verwerken\n"
 
-#: g10/parse-packet.c:688
+#: g10/parse-packet.c:713
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
+"Waarschuwing: mogelijk onveilig symetrisch versleutelde sessie sleutel\n"
 
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1164
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
-msgstr "deelpakket van soort %d heeft kritische bit ingesteld\n"
+msgstr "sub-pakket van type %d heeft het kritieke vlag gezet\n"
 
-#: g10/passphrase.c:465 g10/passphrase.c:512
+#: g10/passphrase.c:310
 msgid "gpg-agent is not available in this session\n"
-msgstr "gpg-agent is niet beschikbaar in deze sessie\n"
-
-#: g10/passphrase.c:473
-msgid "can't set client pid for the agent\n"
-msgstr "kan PID voor agent niet instellen\n"
-
-#: g10/passphrase.c:481
-msgid "can't get server read FD for the agent\n"
-msgstr ""
-
-#: g10/passphrase.c:488
-msgid "can't get server write FD for the agent\n"
-msgstr ""
+msgstr "gpg-agent is niet beschikbaar tijdens deze sessie\n"
 
-#: g10/passphrase.c:521
+#: g10/passphrase.c:326
 msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "misvormde GPG_AGENT_INFO omgevingsvariabele\n"
+msgstr "verkeerde vorm van de GPG_AGENT_INFO omgevingsvariabele\n"
 
-#: g10/passphrase.c:534
+#: g10/passphrase.c:345
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "gpg-agent protocol versie %d wordt niet ondersteund\n"
+msgstr "gpg-agent protocol versie %d is niet ondersteund\n"
 
-#: g10/passphrase.c:555
+#: g10/passphrase.c:362
 #, c-format
 msgid "can't connect to `%s': %s\n"
-msgstr "kan niet verbinden met `%s': %s\n"
-
-#: g10/passphrase.c:577
-msgid "communication problem with gpg-agent\n"
-msgstr "communicatieprobleem met gpg-agent\n"
+msgstr "kan geen verbinding maken met ‘%s’: %s\n"
 
-#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
+#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
-msgstr "probleem met de agent - gebruik van agent uit gezet\n"
+msgstr "problemen met de agent - gebruik van de agent uitgeschakeld\n"
 
-#: g10/passphrase.c:684 g10/passphrase.c:1160
-#, fuzzy, c-format
+#: g10/passphrase.c:532 g10/passphrase.c:914
+#, c-format
 msgid " (main key ID %s)"
-msgstr " (hoofdsleutel ID %08lX)"
+msgstr " (hoofd sleutel ID %s)"
 
-#: g10/passphrase.c:698
-#, fuzzy, c-format
+#: g10/passphrase.c:546
+#, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
 "\"%.*s\"\n"
 "%u-bit %s key, ID %s, created %s%s\n"
 msgstr ""
-"U heeft een wachtwoord nodig om de geheime sleutel te ontgrendelen voor "
-"gebruiker:\n"
-"\"%.*s\"\n"
-"%u-bit %s sleutel, ID %08lX, gemaakt op %s%s\n"
+"U moet een geheime zin opgeven om de geheime sleutel te gebruiken van:\n"
+"“%.*s”\n"
+"%u-bit %s sleutel, ID %s, gemaakt op %s%s\n"
 
-#: g10/passphrase.c:723
+#: g10/passphrase.c:571
 msgid "Repeat passphrase\n"
-msgstr "Herhaal wachtwoord\n"
+msgstr "Herhaal geheime zin\n"
 
-#: g10/passphrase.c:725
+#: g10/passphrase.c:573
 msgid "Enter passphrase\n"
-msgstr "Geef wachtwoord\n"
+msgstr "Geef geheime zin\n"
 
-#: g10/passphrase.c:763
-msgid "passphrase too long\n"
-msgstr "wachtwoord te lang\n"
-
-#: g10/passphrase.c:776
-msgid "invalid response from agent\n"
-msgstr "ongeldig antwoord van agent\n"
-
-#: g10/passphrase.c:791 g10/passphrase.c:886
+#: g10/passphrase.c:649
 msgid "cancelled by user\n"
-msgstr "geannuleerd door gebruiker\n"
-
-#: g10/passphrase.c:796 g10/passphrase.c:975
-#, c-format
-msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr "probleem met agent: agent geeft 0x%lx terug\n"
+msgstr "onderbroken door de gebruiker\n"
 
-#: g10/passphrase.c:1053 g10/passphrase.c:1212
-#, fuzzy
+#: g10/passphrase.c:805 g10/passphrase.c:974
 msgid "can't query passphrase in batch mode\n"
-msgstr "kan niet vragen om wachtwoord in batch-modus\n"
+msgstr "kan geheime zin niet opvragen in batch modus\n"
 
-#: g10/passphrase.c:1058 g10/passphrase.c:1217
+#: g10/passphrase.c:812 g10/passphrase.c:979
 msgid "Enter passphrase: "
-msgstr "Geef wachtwoord: "
+msgstr "Geef geheime zin: "
 
-#: g10/passphrase.c:1141
-#, fuzzy, c-format
+#: g10/passphrase.c:895
+#, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
 "user: \"%s\"\n"
 msgstr ""
-"\n"
-"U heeft een wachtwoord nodig om de geheime sleutel\n"
-"voor de gebruiker te ontgrendelen: \""
+"U moet een geheime zin opgeven om de geheime sleutel te gebruiken\n"
+"van: “%s”\n"
 
-#: g10/passphrase.c:1147
-#, fuzzy, c-format
+#: g10/passphrase.c:901
+#, c-format
 msgid "%u-bit %s key, ID %s, created %s"
-msgstr "%u-bit %s sleutel, ID %08lX, gemaakt op %s"
+msgstr "%u-bit %s key, ID %s, created %s"
 
-#: g10/passphrase.c:1156
+#: g10/passphrase.c:910
 #, c-format
 msgid "         (subkey on main key ID %s)"
-msgstr ""
+msgstr "         (sub-sleutel bij hoofd sleutel ID %s)"
 
-#: g10/passphrase.c:1221
+#: g10/passphrase.c:987
 msgid "Repeat passphrase: "
-msgstr "Herhaal wachtwoord: "
+msgstr "Herhaal geheime zin: "
 
-#: g10/photoid.c:66
+#: g10/photoid.c:73
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4787,441 +5019,455 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 "\n"
-"Kies een afbeelding om te gebruiken als uw foto ID.  De afbeelding moet een\n"
-"JPEG-bestand zijn. Bedenk dat deze afbeelding bewaard wordt in uw openbare\n"
-"sleutel.  Als u een hele grote afbeelding gebruikt, wordt uw sleutel ook "
-"erg\n"
-"groot!  Een afbeeldingsgrootte dichtbij 240x288 is het best.\n"
-
-#: g10/photoid.c:80
+"Selecteer een afbeelding om bij Uw foto ID te gebruiken.  De afbeelding moet "
+"een JPEG\n"
+"bestand zijn. Onthoud dat deze met uw publieke sleutel wordt opgeslagen.\n"
+"Als de afbeelding groot is heeft dit directe gevolgen voor uw publieke "
+"sleutel!\n"
+"Houd het formaat ongeveer 240x288 voor optimaal resultaat.\n"
+
+#: g10/photoid.c:95
 msgid "Enter JPEG filename for photo ID: "
-msgstr "Geef JPEG-bestandsnaam voor foto ID: "
+msgstr "Geef JPEG bestand voor foto ID: "
 
-#: g10/photoid.c:94
-#, fuzzy, c-format
+#: g10/photoid.c:116
+#, c-format
 msgid "unable to open JPEG file `%s': %s\n"
-msgstr "kan bestand niet openen: %s\n"
+msgstr "kan JPEG bestand ‘%s’ niet openen: %s\n"
 
-#: g10/photoid.c:102
+#: g10/photoid.c:127
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
-msgstr ""
+msgstr "dit JPEG bestand is erg groot (%d bytes) !\n"
 
-#: g10/photoid.c:104
+#: g10/photoid.c:129
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
-msgstr "Weet u zeker dat u deze wilt gebruiken (j/N)? "
+msgstr "Weet U zeker dat U deze wilt gebruiken? (j/N) "
 
-#: g10/photoid.c:119
-#, fuzzy, c-format
+#: g10/photoid.c:146
+#, c-format
 msgid "`%s' is not a JPEG file\n"
-msgstr "\"%s\" is geen JPEG-bestand\n"
+msgstr "‘%s’ is geen JPEG bestand\n"
 
-#: g10/photoid.c:136
+#: g10/photoid.c:165
+#, fuzzy
 msgid "Is this photo correct (y/N/q)? "
-msgstr "Is deze foto goed (j/N/q)? "
+msgstr "Is deze foto goed (j/N/s)? "
+
+#: g10/photoid.c:329
+msgid "no photo viewer set\n"
+msgstr "geen programma geslecteerd om de foto te tonen\n"
 
-#: g10/photoid.c:338
+#: g10/photoid.c:383
 msgid "unable to display photo ID!\n"
-msgstr "kan foto ID niet weergeven!\n"
+msgstr "het is niet mogelijk de foto ID te tonen!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:580
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Geen reden opgegeven"
 
-#: g10/pkclist.c:63 g10/revoke.c:582
+#: g10/pkclist.c:64 g10/revoke.c:625
 msgid "Key is superseded"
-msgstr "Sleutel is achterhaald"
+msgstr "Sleutel is vervangen"
 
-#: g10/pkclist.c:65 g10/revoke.c:581
+#: g10/pkclist.c:66 g10/revoke.c:624
 msgid "Key has been compromised"
-msgstr "Sleutel is in gevaar gebracht"
+msgstr "Sleutel is niet meer te vertrouwen"
 
-#: g10/pkclist.c:67 g10/revoke.c:583
+#: g10/pkclist.c:68 g10/revoke.c:626
 msgid "Key is no longer used"
-msgstr "Sleutel wordt niet meer gebruikt"
+msgstr "Sleutel is niet meer in gebruik"
 
-#: g10/pkclist.c:69 g10/revoke.c:584
+#: g10/pkclist.c:70 g10/revoke.c:627
 msgid "User ID is no longer valid"
-msgstr "Gebruikerscode is niet langer geldig"
+msgstr "Gebruiker ID is niet meer geldig"
 
-#: g10/pkclist.c:73
+#: g10/pkclist.c:74
 msgid "reason for revocation: "
-msgstr "reden voor herroeping: "
+msgstr "reden van opheffen: "
 
-#: g10/pkclist.c:90
+#: g10/pkclist.c:91
 msgid "revocation comment: "
-msgstr "herroepingsopmerking: "
+msgstr "opmerking bij opheffen: "
 
-#: g10/pkclist.c:205
+#: g10/pkclist.c:206
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:213
-#, fuzzy
+#: g10/pkclist.c:214
 msgid "No trust value assigned to:\n"
-msgstr ""
-"Geen vertrouwenswaarde toegewezen aan:\n"
-"%4u%c/%08lX %s \""
+msgstr "Er is geen vertrouwenswaarde opgegeven aan:\n"
 
-#: g10/pkclist.c:245
-#, fuzzy, c-format
+#: g10/pkclist.c:246
+#, c-format
 msgid "  aka \"%s\"\n"
-msgstr "                alias \""
+msgstr "  ook bekend als “%s”\n"
 
-#: g10/pkclist.c:255
-#, fuzzy
+#: g10/pkclist.c:256
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
-msgstr "Deze sleutel is waarschijnlijk van de eigenaar\n"
+msgstr ""
+"In hoeverre vertrouwd U er op dat deze sleutel werkelijk bij deze persoon "
+"hoort?\n"
 
-#: g10/pkclist.c:270
-#, fuzzy, c-format
+#: g10/pkclist.c:271
+#, c-format
 msgid "  %d = I don't know or won't say\n"
-msgstr " %d = Weet niet\n"
+msgstr "  %d = Weet ik nier / Wil ik niet zeggen\n"
 
-#: g10/pkclist.c:272
-#, fuzzy, c-format
+#: g10/pkclist.c:273
+#, c-format
 msgid "  %d = I do NOT trust\n"
-msgstr " %d = Ik vertrouw NIET\n"
+msgstr "  %d = Ik vertrouw het niet\n"
 
-#: g10/pkclist.c:278
-#, fuzzy, c-format
+#: g10/pkclist.c:279
+#, c-format
 msgid "  %d = I trust ultimately\n"
-msgstr " %d = Ik vertrouw maximaal\n"
+msgstr "  %d = Ik vertrouw het volledig\n"
 
-#: g10/pkclist.c:284
-#, fuzzy
+#: g10/pkclist.c:285
 msgid "  m = back to the main menu\n"
-msgstr " m = terug naar het hoofdmenu\n"
+msgstr "  m = terug naar het hoofdmenu\n"
 
-#: g10/pkclist.c:287
-#, fuzzy
+#: g10/pkclist.c:288
 msgid "  s = skip this key\n"
-msgstr " s = deze sleutel overslaan\n"
+msgstr "  s = sla deze sleutel over\n"
 
-#: g10/pkclist.c:288
-#, fuzzy
+#: g10/pkclist.c:289
 msgid "  q = quit\n"
-msgstr " q = afsluiten\n"
+msgstr "  q = stoppen\n"
 
-#: g10/pkclist.c:292
+#: g10/pkclist.c:293
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
+"Het minimale vertrouwensniveau voor deze sleutel is: %s\n"
+"\n"
 
-#: g10/pkclist.c:298 g10/revoke.c:609
+#: g10/pkclist.c:299 g10/revoke.c:652
 msgid "Your decision? "
-msgstr "Uw beslissing? "
+msgstr "Uw keuze? "
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
-msgstr "Wilt u deze sleutel echt maximaal vertrouwen? "
+msgstr "Vertrouwd U deze sleutel werkelijk volledig? (j/N) "
 
-#: g10/pkclist.c:333
+#: g10/pkclist.c:334
 msgid "Certificates leading to an ultimately trusted key:\n"
-msgstr "Certificaten die leiden tot een maximaal vertrouwde sleutel:\n"
+msgstr "Certificaten die leiden tot een volledig vertrouwde sleutel:\n"
 
-#: g10/pkclist.c:418
-#, fuzzy, c-format
+#: g10/pkclist.c:419
+#, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
-"%08lX: Er is geen aanwijzing dat deze sleutel echt van de eigenaar is\n"
+"%s: Er is geen zekerheid dat deze sleutel werkelijk van de genoemde persoon "
+"is\n"
 
-#: g10/pkclist.c:423
-#, fuzzy, c-format
+#: g10/pkclist.c:424
+#, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
-"%08lX: Er is geen aanwijzing dat deze sleutel echt van de eigenaar is\n"
+"%s: Er is beperkte zekerheid dat deze sleutel werkelijk van de genoemde "
+"persoon is\n"
 
-#: g10/pkclist.c:429
-#, fuzzy
+#: g10/pkclist.c:430
 msgid "This key probably belongs to the named user\n"
-msgstr "Deze sleutel is waarschijnlijk van de eigenaar\n"
+msgstr "Deze sleutel is waarschijnlijk van de genoemde persoon\n"
 
-#: g10/pkclist.c:434
+#: g10/pkclist.c:435
 msgid "This key belongs to us\n"
 msgstr "Deze sleutel is van ons\n"
 
-#: g10/pkclist.c:460
-#, fuzzy
+#: g10/pkclist.c:461
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
 "you may answer the next question with yes.\n"
 msgstr ""
-"Het is NIET zeker dat deze sleutel echt van de persoon is die\n"
-"in de gebruikerscode staat.  Als u *echt* weet wat u doet, kunt\n"
-"u de volgende vraag met ja beantwoorden\n"
-"\n"
+"Het is NIET zeker dat deze sleutel van de genoemde persoon is die genoemd "
+"wordt\n"
+"in de gebruikers ID. Als U echter HEEL zeker weet wat U doet,\n"
+"kan u op de volgende vraag Ja beantwoorden.\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:468
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
-msgstr "Toch deze sleutel gebruiken? "
+msgstr "Deze sleutel echt gebruiken? (j/N) "
 
-#: g10/pkclist.c:501
+#: g10/pkclist.c:502
 msgid "WARNING: Using untrusted key!\n"
-msgstr "WAARSCHUWING: Er wordt een niet-vertrouwde sleutel gebruikt!\n"
+msgstr "Waarschuwing: U gebruikt een onbetrouwbare sleutel!\n"
 
-#: g10/pkclist.c:508
-#, fuzzy
+#: g10/pkclist.c:509
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
-"WAARSCHUWING: sleutel %08lX kan herroepen zijn: herroepingssleutel %08lX "
-"niet aanwezig.\n"
+"Waarschuwing: deze sleutel kan ingetrokken zijn (maar de intrekkingssleutel "
+"is niet beschikbaar)\n"
 
-#: g10/pkclist.c:517
-#, fuzzy
+#: g10/pkclist.c:518
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
-msgstr "WAARSCHUWING: Deze sleutel is herroepen door zijn eigenaar!\n"
+msgstr ""
+"Waarschuwing: Deze sleutel is ingetrokken door de bevoegde intrekker!\n"
 
-#: g10/pkclist.c:520
+#: g10/pkclist.c:521
 msgid "WARNING: This key has been revoked by its owner!\n"
-msgstr "WAARSCHUWING: Deze sleutel is herroepen door zijn eigenaar!\n"
+msgstr "Waarschuwing: Deze sleutel is ingetrokken door de eigenaar!\n"
 
-#: g10/pkclist.c:521
-#, fuzzy
+#: g10/pkclist.c:522
 msgid "         This could mean that the signature is forged.\n"
-msgstr "         Dit kan betekenen dat de ondertekening een vervalsing is.\n"
+msgstr "         Dit kan betekenen dat de ondertekening is vervalst.\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:528
 msgid "WARNING: This subkey has been revoked by its owner!\n"
-msgstr "WAARSCHUWING: Deze deelsleutel is herroepen door zijn eigenaar!\n"
+msgstr "Waarschuwing: Deze sub-sleutel is ingetrokken door de eigenaar!\n"
 
-#: g10/pkclist.c:532
+#: g10/pkclist.c:533
 msgid "Note: This key has been disabled.\n"
-msgstr "Let op: Deze sleutel is uit gezet.\n"
+msgstr "Noot: Deze sleutel is uitgeschakeld.\n"
 
-#: g10/pkclist.c:537
+#: g10/pkclist.c:553
+#, c-format
+msgid "Note: Verified signer's address is `%s'\n"
+msgstr "Noot: Het gecontroleerde adres van de ondertekenaar is ‘%s’\n"
+
+# TODO
+#: g10/pkclist.c:560
+#, c-format
+msgid "Note: Signer's address `%s' does not match DNS entry\n"
+msgstr "Note: Signer's address ‘%s’ does not match DNS entry\n"
+
+#: g10/pkclist.c:572
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr "trustlevel adjusted to FULL due to valid PKA info\n"
+
+#: g10/pkclist.c:580
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr "trustlevel adjusted to NEVER due to bad PKA info\n"
+
+#: g10/pkclist.c:591
 msgid "Note: This key has expired!\n"
-msgstr "Let op: Deze sleutel is verlopen!\n"
+msgstr "Note: This key has expired!\n"
 
-#: g10/pkclist.c:548
+#: g10/pkclist.c:602
 msgid "WARNING: This key is not certified with a trusted signature!\n"
-msgstr ""
-"WAARSCHUWING: Deze sleutel is niet gecertificeerd met een vertrouwde "
-"ondertekening!\n"
+msgstr "WARNING: This key is not certified with a trusted signature!\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:604
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
-"         Er is geen aanwijzing dat de ondertekening is van de eigenaar.\n"
+"         There is no indication that the signature belongs to the owner.\n"
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:612
 msgid "WARNING: We do NOT trust this key!\n"
-msgstr "WAARSCHUWING: Vertrouw deze sleutel NIET!\n"
+msgstr "WARNING: We do NOT trust this key!\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:613
 msgid "         The signature is probably a FORGERY.\n"
-msgstr "         De ondertekening is waarschijnlijk VERVALST.\n"
+msgstr "         The signature is probably a FORGERY.\n"
 
-#: g10/pkclist.c:567
+#: g10/pkclist.c:621
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
-"WAARSCHUWING: Deze sleutel is niet gecertificeerd met voldoende vertrouwde "
-"ondertekeningen!\n"
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
-msgstr "         Het is niet zeker dat de ondertekening is van de eigenaar.\n"
+msgstr "         It is not certain that the signature belongs to the owner.\n"
 
-#: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
+#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
-msgstr "%s: overgeslagen: %s\n"
+msgstr "%s: skipped: %s\n"
 
-#: g10/pkclist.c:744 g10/pkclist.c:968
+#: g10/pkclist.c:834 g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
-msgstr "%s: overgeslagen: openbare sleutel reeds aanwezig\n"
+msgstr "%s: skipped: public key already present\n"
 
-#: g10/pkclist.c:786
+#: g10/pkclist.c:885
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
-msgstr "U heeft geen gebruikerscode opgegeven. (u kunt \"-r\" gebruiken)\n"
+msgstr "You did not specify a user ID. (you may use “-r”)\n"
 
-#: g10/pkclist.c:802
+#: g10/pkclist.c:909
 msgid "Current recipients:\n"
-msgstr ""
+msgstr "Current recipients:\n"
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:935
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 "\n"
-"Geef een gebruikerscode.  Eindig met een lege regel: "
+"Enter the user ID.  End with an empty line: "
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:960
 msgid "No such user ID.\n"
-msgstr "Gebruikerscode niet gevonden.\n"
+msgstr "No such user ID.\n"
 
-#: g10/pkclist.c:849 g10/pkclist.c:911
+#: g10/pkclist.c:969 g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
-msgstr ""
-"overgeslagen: openbare sleutel reeds ingesteld als standaard ontvanger\n"
+msgstr "skipped: public key already set as default recipient\n"
 
-#: g10/pkclist.c:867
+#: g10/pkclist.c:990
 msgid "Public key is disabled.\n"
-msgstr "Openbare sleutel is uit gezet.\n"
+msgstr "Public key is disabled.\n"
 
-#: g10/pkclist.c:874
+#: g10/pkclist.c:999
 msgid "skipped: public key already set\n"
-msgstr "overgeslagen: openbare sleutel reeds ingesteld\n"
+msgstr "skipped: public key already set\n"
 
-#: g10/pkclist.c:903
-#, fuzzy, c-format
+#: g10/pkclist.c:1034
+#, c-format
 msgid "unknown default recipient \"%s\"\n"
-msgstr "onbekende standaard ontvanger `%s'\n"
+msgstr "unknown default recipient “%s”\n"
 
-#: g10/pkclist.c:948
+#: g10/pkclist.c:1092
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
-msgstr "%s: overgeslagen: openbare sleutel is uit gezet\n"
+msgstr "%s: skipped: public key is disabled\n"
 
-#: g10/pkclist.c:1003
+#: g10/pkclist.c:1154
 msgid "no valid addressees\n"
-msgstr "geen geldige geadresseerden\n"
+msgstr "no valid addressees\n"
 
-#: g10/plaintext.c:90
+#: g10/plaintext.c:91
 msgid "data not saved; use option \"--output\" to save it\n"
-msgstr ""
-"gegevens niet opgeslagen; gebruik optie \"--output\" om gegevens op te "
-"slaan\n"
+msgstr "data not saved; use option “--output” to save it\n"
 
-#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157
+#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
-msgstr "fout bij maken `%s': %s\n"
+msgstr "error creating ‘%s’: %s\n"
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:452
 msgid "Detached signature.\n"
-msgstr "Losgekoppelde ondertekening.\n"
+msgstr "Detached signature.\n"
 
-#: g10/plaintext.c:449
+#: g10/plaintext.c:458
 msgid "Please enter name of data file: "
-msgstr "Geef bestandsnaam van gegevensbestand: "
+msgstr "Please enter name of data file: "
 
-#: g10/plaintext.c:477
+#: g10/plaintext.c:490
 msgid "reading stdin ...\n"
-msgstr "bezig met lezen standaard invoer...\n"
+msgstr "reading stdin ...\n"
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:524
 msgid "no signed data\n"
-msgstr "geen ondertekende gegevens\n"
+msgstr "no signed data\n"
 
-#: g10/plaintext.c:525
+#: g10/plaintext.c:538
 #, c-format
 msgid "can't open signed data `%s'\n"
-msgstr "kan ondertekende gegevens `%s' niet openen\n"
+msgstr "can't open signed data ‘%s’\n"
 
-#: g10/pubkey-enc.c:103
-#, fuzzy, c-format
+#: g10/pubkey-enc.c:104
+#, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
-msgstr "anonieme ontvanger; geheime sleutel %08lX wordt geprobeerd...\n"
+msgstr "anonymous recipient; trying secret key %s ...\n"
 
-#: g10/pubkey-enc.c:119
+#: g10/pubkey-enc.c:135
 msgid "okay, we are the anonymous recipient.\n"
-msgstr "goed, we zijn de anonieme ontvanger.\n"
+msgstr "okay, we are the anonymous recipient.\n"
 
-#: g10/pubkey-enc.c:207
+#: g10/pubkey-enc.c:223
 msgid "old encoding of the DEK is not supported\n"
-msgstr "oude codering van DEK wordt niet ondersteund\n"
+msgstr "old encoding of the DEK is not supported\n"
 
-#: g10/pubkey-enc.c:228
+#: g10/pubkey-enc.c:244
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
-msgstr "coderingsalgoritme %d%s is onbekend of uit gezet\n"
+msgstr "versleutelalgoritme %d%s is unknown or disabled\n"
 
-#: g10/pubkey-enc.c:266
-#, fuzzy, c-format
+#: g10/pubkey-enc.c:282
+#, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
-msgstr "LET OP: coderingsalgoritme %d niet gevonden in voorkeuren\n"
+msgstr "WARNING: versleutelalgoritme %s not found in recipient preferences\n"
 
-#: g10/pubkey-enc.c:286
-#, fuzzy, c-format
+#: g10/pubkey-enc.c:302
+#, c-format
 msgid "NOTE: secret key %s expired at %s\n"
-msgstr "LET OP: geheime sleutel %08lX verlopen op %s\n"
+msgstr "NOTE: secret key %s expired at %s\n"
 
-#: g10/pubkey-enc.c:292
+#: g10/pubkey-enc.c:308
 msgid "NOTE: key has been revoked"
-msgstr "LET OP: sleutel is herroepen"
+msgstr "NOTE: key has been revoked"
 
-#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:545
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:588
 #, c-format
 msgid "build_packet failed: %s\n"
-msgstr "build_packet mislukt: %s\n"
+msgstr "build_packet failed: %s\n"
 
-#: g10/revoke.c:146
-#, fuzzy, c-format
+#: g10/revoke.c:147
+#, c-format
 msgid "key %s has no user IDs\n"
-msgstr "sleutel %08lX: gebruikerscode niet gevonden\n"
+msgstr "key %s has no user IDs\n"
 
-#: g10/revoke.c:272
+#: g10/revoke.c:308
 msgid "To be revoked by:\n"
-msgstr "Zal worden herroepen door:\n"
+msgstr "To be revoked by:\n"
 
-#: g10/revoke.c:276
+#: g10/revoke.c:312
 msgid "(This is a sensitive revocation key)\n"
-msgstr "(Dit is een gevoelige herroepingssleutel)\n"
+msgstr "(This is a sensitive revocation key)\n"
 
-#: g10/revoke.c:280
+#: g10/revoke.c:316
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
-msgstr "Wilt u een herroepingscertificaat aanmaken voor deze sleutel? "
+msgstr "Create a designated revocation certificate for this key? (j/N) "
 
-#: g10/revoke.c:293 g10/revoke.c:511
+#: g10/revoke.c:329 g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
-msgstr "ASCII-bepantserde uitvoer afgedwongen.\n"
+msgstr "ASCII versleutelde uitvoer geforceerd.\n"
 
-#: g10/revoke.c:307 g10/revoke.c:525
+#: g10/revoke.c:344 g10/revoke.c:568
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
-msgstr "make_keysig_packet mislukt: %s\n"
+msgstr "make_keysig_packet failed: %s\n"
 
-#: g10/revoke.c:370
+#: g10/revoke.c:407
 msgid "Revocation certificate created.\n"
-msgstr "Herroepingscertificaat aangemaakt.\n"
+msgstr "Revocation certificate created.\n"
 
-#: g10/revoke.c:376
-#, fuzzy, c-format
+#: g10/revoke.c:413
+#, c-format
 msgid "no revocation keys found for \"%s\"\n"
-msgstr "geen herroepingssleutels gevonden voor `%s'\n"
+msgstr "no revocation keys found for “%s”\n"
 
-#: g10/revoke.c:432
-#, fuzzy, c-format
+#: g10/revoke.c:471
+#, c-format
 msgid "secret key \"%s\" not found: %s\n"
-msgstr "geheime sleutel `%s' niet gevonden: %s\n"
+msgstr "secret key “%s” not found: %s\n"
 
-#: g10/revoke.c:461
+#: g10/revoke.c:500
 #, c-format
 msgid "no corresponding public key: %s\n"
-msgstr "geen geassocieerde openbare sleutel: %s\n"
+msgstr "no corresponding public key: %s\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:511
 msgid "public key does not match secret key!\n"
-msgstr "openbare sleutel komt niet overeen met geheime sleutel!\n"
+msgstr "public key does not match secret key!\n"
 
-#: g10/revoke.c:479
+#: g10/revoke.c:518
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
-msgstr "Wilt u een herroepingscertificaat aanmaken voor deze sleutel? "
+msgstr "Create a revocation certificate for this key? (j/N) "
 
-#: g10/revoke.c:496
+#: g10/revoke.c:535
 msgid "unknown protection algorithm\n"
-msgstr "onbekend beschermingsalgoritme\n"
+msgstr "unknown protection algorithm\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:543
 msgid "NOTE: This key is not protected!\n"
-msgstr "LET OP: deze sleutel wordt niet beschermd!\n"
+msgstr "NOTE: This key is not protected!\n"
 
-#: g10/revoke.c:551
+#: g10/revoke.c:594
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5231,1345 +5477,913 @@ msgid ""
 "your media become unreadable.  But have some caution:  The print system of\n"
 "your machine might store the data and make it available to others!\n"
 msgstr ""
-"Herroepingscertificaat aangemaakt.\n"
+"Revocation certificate created.\n"
 "\n"
-"Bewaar het alstublieft op een medium dat u kunt verstoppen; als boze\n"
-"Gijs er toegang toe krijgt, kan hij het gebruiken om uw sleutel onbruikbaar\n"
-"te maken. Het is slim om dit certificaat af te drukken en te verstoppen, in\n"
-"het geval dat het medium onleesbaar wordt.  Maar pas wel op:  uw afdruk-\n"
-"systeem bewaart mogelijk de gegevens en maakt ze beschikbaar voor\n"
-"anderen!\n"
-
-#: g10/revoke.c:592
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
-msgstr "Kies alstublieft een reden voor de herroeping:\n"
+msgstr "Please select the reason for the revocation:\n"
 
-#: g10/revoke.c:602
+#: g10/revoke.c:645
 msgid "Cancel"
-msgstr "Annuleren"
+msgstr "Cancel"
 
-#: g10/revoke.c:604
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
-msgstr "(Waarschijnlijk wilt u hier %d kiezen)\n"
+msgstr "(Probably you want to select %d here)\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
-msgstr "Geef een optionele beschrijving; eindig met een lege regel:\n"
+msgstr "Enter an optional description; end it with an empty line:\n"
 
-#: g10/revoke.c:673
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
-msgstr "Reden voor herroeping: %s\n"
+msgstr "Reason for revocation: %s\n"
 
-#: g10/revoke.c:675
+#: g10/revoke.c:718
 msgid "(No description given)\n"
-msgstr "(Geen beschrijving gegeven)\n"
+msgstr "(No description given)\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
-msgstr "Is dit goed? "
+msgstr "Is this okay? (j/N) "
 
-#: g10/seckey-cert.c:54
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
-msgstr "delen geheime sleutel zijn niet beschikbaar\n"
+msgstr "secret key parts are not available\n"
 
-#: g10/seckey-cert.c:60
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
-msgstr "beschermingsalgoritme %d%s wordt niet ondersteund\n"
+msgstr "protection algorithm %d%s is not supported\n"
 
-#: g10/seckey-cert.c:71
-#, fuzzy, c-format
+#: g10/seckey-cert.c:72
+#, c-format
 msgid "protection digest %d is not supported\n"
-msgstr "beschermingsalgoritme %d%s wordt niet ondersteund\n"
+msgstr "protection samenvatting %d is not supported\n"
 
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:266
 msgid "Invalid passphrase; please try again"
-msgstr "Ongeldig wachtwoord; probeer alstublieft opnieuw"
+msgstr "Invalid passphrase; please try again"
 
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:267
 #, c-format
 msgid "%s ...\n"
-msgstr "%s...\n"
+msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:328
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
-msgstr ""
-"WAARSCHUWING: Zwakke sleutel gevonden - wijzig alstublieft het wachtwoord "
-"opnieuw.\n"
+msgstr "WARNING: Weak key detected - please change passphrase again.\n"
 
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:366
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
-msgstr ""
-"er wordt een afgeraden 16-bit controlesom gegenereerd om te geheime sleutel "
-"te beschermen\n"
+msgstr "generating the deprecated 16-bit checksum for secret key protection\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:54
 msgid "weak key created - retrying\n"
-msgstr "zwakke sleutel aangemaakt - bezig met opnieuw proberen\n"
+msgstr "weak key created - retrying\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:59
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
-"kan zwakke sleutel voor symmetrische codering niet vermijden; %d keer "
-"geprobeerd!\n"
+"cannot avoid weak key for symmetric versleutelalgoritme; tried %d times!\n"
+
+#: g10/seskey.c:222
+msgid "DSA requires the hash length to be a multiple of 8 bits\n"
+msgstr "DSA requires the hash length to be a multiple of 8 bits\n"
 
-#: g10/seskey.c:213
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA vereist het gebruik van een 160-bits hash-algoritme\n"
+#: g10/seskey.c:236
+#, c-format
+msgid "DSA key %s uses an unsafe (%u bit) hash\n"
+msgstr "DSA key %s uses an unsafe (%u bit) hash\n"
+
+#: g10/seskey.c:248
+#, c-format
+msgid "DSA key %s requires a %u bit or larger hash\n"
+msgstr "DSA key %s requires a %u bit or larger hash\n"
 
-#: g10/sig-check.c:75
+#: g10/sig-check.c:76
 msgid "WARNING: signature digest conflict in message\n"
-msgstr "WAARSCHUWING: ondertekening en digest conflicteren in bericht\n"
+msgstr "WARNING: signature samenvatting conflict in message\n"
 
-#: g10/sig-check.c:99
+#: g10/sig-check.c:101
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
-msgstr ""
+msgstr "WARNING: signing subkey %s is not cross-certified\n"
 
-#: g10/sig-check.c:102
-#, fuzzy, c-format
+#: g10/sig-check.c:113
+#, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
-msgstr ""
-"WAARSCHUWING: het aanwijzen van een sleutel als een aangestelde herroeper "
-"kan niet ongedaan gemaakt worden!\n"
+msgstr "WARNING: signing subkey %s has an invalid cross-certification\n"
 
-#: g10/sig-check.c:168
-#, fuzzy, c-format
+#: g10/sig-check.c:181
+#, c-format
 msgid "public key %s is %lu second newer than the signature\n"
-msgstr "openbare sleutel %08lX is %lu seconde nieuwer dan de ondertekening\n"
+msgstr "public key %s is %lu second newer than the signature\n"
 
-#: g10/sig-check.c:169
-#, fuzzy, c-format
+#: g10/sig-check.c:182
+#, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
-msgstr "openbare sleutel %08lX is %lu seconden nieuwer dan de ondertekening\n"
+msgstr "public key %s is %lu seconds newer than the signature\n"
 
-#: g10/sig-check.c:180
-#, fuzzy, c-format
+#: g10/sig-check.c:193
+#, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
-"sleutel is %lu seconde in de toekomst aangemaakt (tijdsreis of "
-"klokprobleem)\n"
+"key %s was created %lu second in the future (time warp or clock problem)\n"
 
-#: g10/sig-check.c:182
-#, fuzzy, c-format
+#: g10/sig-check.c:195
+#, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
-"sleutel is %lu seconden in de toekomst aangemaakt (tijdsreis of "
-"klokprobleem)\n"
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 
-#: g10/sig-check.c:192
-#, fuzzy, c-format
+#: g10/sig-check.c:205
+#, c-format
 msgid "NOTE: signature key %s expired %s\n"
-msgstr "LET OP: ondertekening van sleutel %08lX verlopen op %s\n"
+msgstr "NOTE: signature key %s expired %s\n"
 
-#: g10/sig-check.c:275
-#, fuzzy, c-format
+#: g10/sig-check.c:287
+#, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
-msgstr ""
-"er wordt aangenomen dat de ondertekening van sleutel %08lX slecht is, "
-"vanwege een onbekende kritische bit\n"
+msgstr "assuming bad signature from key %s due to an unknown critical bit\n"
 
-#: g10/sig-check.c:532
-#, fuzzy, c-format
+#: g10/sig-check.c:544
+#, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
-msgstr "sleutel %08lX: geen deelsleutel voor deelsleutel-herroepingspakket\n"
+msgstr "key %s: no subkey for subkey revocation signature\n"
 
-#: g10/sig-check.c:558
-#, fuzzy, c-format
+#: g10/sig-check.c:570
+#, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
-msgstr "sleutel %08lX: geen deelsleutel voor sleutelkoppeling\n"
+msgstr "key %s: no subkey for subkey binding signature\n"
 
 #: g10/sign.c:85
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"kan geen notatiegegevens in v3 (PGP 2.x stijl) ondertekeningen stoppen\n"
+msgstr "can't put notation data into v3 (PGP 2.x style) signatures\n"
 
 #: g10/sign.c:93
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-"kan geen notatiegegevens in v3 (PGP 2.x stijl) sleutelondertekeningen "
-"stoppen\n"
+msgstr "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 
-#: g10/sign.c:112
+#: g10/sign.c:107
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
-"WAARSCHUWING: kan notatie niet %%-uitbreiden  (te groot).  Niet uitgebreide "
-"versie wordt gebruikt.\n"
+"WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:124
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "kan geen beleid-URL in v3 (PGP 2.x stijl) ondertekeningen stoppen\n"
+msgstr "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 
-#: g10/sign.c:146
+#: g10/sign.c:132
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr "kan geen beleid-URL in v3 (PGP 2.x stijl) ondertekeningen stoppen\n"
+msgstr "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 
-#: g10/sign.c:159
-#, fuzzy, c-format
+#: g10/sign.c:145
+#, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
-"WAARSCHUWING: kan beleid-URL niet %%-uitbreiden (te groot).  Niet "
-"uitgebreide versie wordt gebruikt.\n"
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 
-#: g10/sign.c:187
-#, fuzzy, c-format
+#: g10/sign.c:173
+#, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr ""
-"WAARSCHUWING: kan beleid-URL niet %%-uitbreiden (te groot).  Niet "
-"uitgebreide versie wordt gebruikt.\n"
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
 
-#: g10/sign.c:364
+#: g10/sign.c:346
 #, c-format
 msgid "checking created signature failed: %s\n"
-msgstr "het controleren van de aangemaakte ondertekening is mislukt: %s\n"
+msgstr "checking created signature failed: %s\n"
 
-#: g10/sign.c:373
-#, fuzzy, c-format
+#: g10/sign.c:355
+#, c-format
 msgid "%s/%s signature from: \"%s\"\n"
-msgstr "%s ondertekening van: \"%s\"\n"
+msgstr "%s/%s signature from: “%s”\n"
 
-#: g10/sign.c:741
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
-"u kunt alleen losgekoppeld ondertekenen met PGP 2.x stijl sleutels in in --"
-"pgp2 modus\n"
+"you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 
-#: g10/sign.c:808
-#, fuzzy, c-format
+#: g10/sign.c:862
+#, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
-"afdwingen van digest-algoritme %s (%d) overtreedt voorkeuren ontvanger\n"
+"WARNING: forcing samenvattings algorithm %s (%d) violates recipient "
+"preferences\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:988
 msgid "signing:"
-msgstr "bezig met ondertekenen:"
+msgstr "signing:"
 
-#: g10/sign.c:1007
+#: g10/sign.c:1101
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
-msgstr ""
-"u kunt alleen niet-gecodeerde ondertekeningen maken met PGP 2.x stijl "
-"sleutels in --pgp2 modus\n"
+msgstr "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 
-#: g10/sign.c:1180
+#: g10/sign.c:1280
 #, c-format
 msgid "%s encryption will be used\n"
-msgstr "%s codering zal worden gebruikt\n"
+msgstr "%s encryption will be used\n"
 
-#: g10/skclist.c:126 g10/skclist.c:190
+#: g10/skclist.c:128 g10/skclist.c:192
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr ""
-"sleutel is niet gemarkeerd als onveilig - kan deze niet gebruiken met de nep "
-"RNG!\n"
+msgstr "key is not flagged as insecure - can't use it with the faked RNG!\n"
 
-#: g10/skclist.c:157
-#, fuzzy, c-format
+#: g10/skclist.c:159
+#, c-format
 msgid "skipped \"%s\": duplicated\n"
-msgstr "`%s' overgeslagen: dubbel\n"
+msgstr "skipped “%s”: duplicated\n"
 
-#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
-#, fuzzy, c-format
+#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#, c-format
 msgid "skipped \"%s\": %s\n"
-msgstr "`%s' overgeslagen: %s\n"
+msgstr "skipped “%s”: %s\n"
 
-#: g10/skclist.c:170
+#: g10/skclist.c:172
 msgid "skipped: secret key already present\n"
-msgstr "overgeslagen: geheime sleutel reeds aanwezig\n"
+msgstr "skipped: secret key already present\n"
 
-#: g10/skclist.c:185
-#, fuzzy
+#: g10/skclist.c:187
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
-"`%s' overgeslagen: dit is een met PGP aangemaakte ElGamal-sleutel die niet "
-"veilig is voor ondertekeningen!\n"
+"this is a PGP generated Elgamal key which is not secure for signatures!"
 
-#: g10/tdbdump.c:59 g10/trustdb.c:365
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
-msgstr "vertrouwensingang %lu, soort %d: schrijven mislukt: %s\n"
+msgstr "trust record %lu, type %d: write failed: %s\n"
 
-#: g10/tdbdump.c:104
+#: g10/tdbdump.c:105
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpg --import-ownertrust\" to restore them)\n"
 msgstr ""
-"# Lijst van toegewezen vertrouwenswaarden, gemaakt op %s\n"
-"# (Gebruik \"gpg --import-ownertrust\" om ze te herstellen)\n"
+"# List of assigned trustvalues, created %s\n"
+"# (Use “gpg --import-ownertrust” to restore them)\n"
 
-#: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177
-#, fuzzy, c-format
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#, c-format
 msgid "error in `%s': %s\n"
-msgstr "fout bij lezen `%s': %s\n"
+msgstr "error in ‘%s’: %s\n"
 
-#: g10/tdbdump.c:159
-#, fuzzy
+#: g10/tdbdump.c:160
 msgid "line too long"
-msgstr "regel te lang\n"
+msgstr "line too long"
 
-#: g10/tdbdump.c:167
+#: g10/tdbdump.c:168
 msgid "colon missing"
-msgstr ""
+msgstr "colon missing"
 
-#: g10/tdbdump.c:173
-#, fuzzy
+#: g10/tdbdump.c:174
 msgid "invalid fingerprint"
-msgstr "fout: ongeldige vingerafdruk\n"
+msgstr "invalid fingerprint"
 
-#: g10/tdbdump.c:178
-#, fuzzy
+#: g10/tdbdump.c:179
 msgid "ownertrust value missing"
-msgstr "eigenaarsvertrouwen-waarden invoeren"
+msgstr "ownertrust value missing"
 
-#: g10/tdbdump.c:214
-#, fuzzy, c-format
+#: g10/tdbdump.c:215
+#, c-format
 msgid "error finding trust record in `%s': %s\n"
-msgstr "fout bij vinden vertrouwensgegevens: %s\n"
+msgstr "error finding trust record in ‘%s’: %s\n"
 
-#: g10/tdbdump.c:218
-#, fuzzy, c-format
+#: g10/tdbdump.c:219
+#, c-format
 msgid "read error in `%s': %s\n"
-msgstr "leesfout: %s\n"
+msgstr "read error in ‘%s’: %s\n"
 
-#: g10/tdbdump.c:227 g10/trustdb.c:380
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
-msgstr "trustdb: synchronisatie mislukt: %s\n"
+msgstr "trustdb: sync failed: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1440
+#: g10/tdbio.c:129 g10/tdbio.c:1445
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
-msgstr "trustdb rec %lu: lseek mislukt: %s\n"
+msgstr "trustdb rec %lu: lseek failed: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1447
+#: g10/tdbio.c:135 g10/tdbio.c:1452
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
-msgstr "trustdb rec %lu: schrijven mislukt (n=%d): %s\n"
+msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
 
-#: g10/tdbio.c:244
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
-msgstr "trustdb transactie te groot\n"
+msgstr "trustdb transaction too large\n"
 
-#: g10/tdbio.c:497
-#, fuzzy, c-format
+#: g10/tdbio.c:498
+#, c-format
 msgid "can't access `%s': %s\n"
-msgstr "kan `%s' niet sluiten: %s\n"
+msgstr "can't access ‘%s’: %s\n"
 
-#: g10/tdbio.c:512
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
-msgstr "%s: map bestaat niet!\n"
+msgstr "%s: directory does not exist!\n"
 
-#: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588
-#, fuzzy, c-format
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#, c-format
 msgid "can't create lock for `%s'\n"
-msgstr "kan `%s' niet aanmaken: %s\n"
+msgstr "can't create lock for ‘%s’\n"
 
-#: g10/tdbio.c:524 g10/tdbio.c:591
-#, fuzzy, c-format
+#: g10/tdbio.c:525 g10/tdbio.c:592
+#, c-format
 msgid "can't lock `%s'\n"
-msgstr "kan `%s' niet openen\n"
+msgstr "can't lock ‘%s’\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
-msgstr "%s: aanmaken versie-ingang mislukt: %s"
+msgstr "%s: failed to create version record: %s"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
-msgstr "%s: ongeldige trustdb aangemaakt\n"
+msgstr "%s: invalid trustdb created\n"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
-msgstr "%s: trustdb aangemaakt\n"
+msgstr "%s: trustdb created\n"
 
-#: g10/tdbio.c:597
+#: g10/tdbio.c:602
 msgid "NOTE: trustdb not writable\n"
-msgstr "LET OP: trustdb niet schrijfbaar\n"
+msgstr "NOTE: trustdb not writable\n"
 
-#: g10/tdbio.c:614
+#: g10/tdbio.c:619
 #, c-format
 msgid "%s: invalid trustdb\n"
-msgstr "%s: ongeldige trustdb\n"
+msgstr "%s: invalid trustdb\n"
 
-#: g10/tdbio.c:646
+#: g10/tdbio.c:651
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
-msgstr "%s: aanmaken hash-tabel mislukt: %s\n"
+msgstr "%s: failed to create hashtable: %s\n"
 
-#: g10/tdbio.c:654
+#: g10/tdbio.c:659
 #, c-format
 msgid "%s: error updating version record: %s\n"
-msgstr "%s: fout bij bijwerken versie-ingang: %s\n"
+msgstr "%s: error updating version record: %s\n"
 
-#: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721
-#: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400
+#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
+#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
 #, c-format
 msgid "%s: error reading version record: %s\n"
-msgstr "%s: fout bij lezen versie-ingang: %s\n"
+msgstr "%s: error reading version record: %s\n"
 
-#: g10/tdbio.c:730
+#: g10/tdbio.c:735
 #, c-format
 msgid "%s: error writing version record: %s\n"
-msgstr "%s: fout bij schrijven versie-ingang: %s\n"
+msgstr "%s: error writing version record: %s\n"
 
-#: g10/tdbio.c:1169
+#: g10/tdbio.c:1174
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
-msgstr "trustdb: lseek mislukt: %s\n"
+msgstr "trustdb: lseek failed: %s\n"
 
-#: g10/tdbio.c:1177
+#: g10/tdbio.c:1182
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
-msgstr "trustdb: lezen mislukt (n=%d): %s\n"
+msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1198
+#: g10/tdbio.c:1203
 #, c-format
 msgid "%s: not a trustdb file\n"
-msgstr "%s: geen trustdb bestand\n"
+msgstr "%s: not a trustdb file\n"
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1221
 #, c-format
 msgid "%s: version record with recnum %lu\n"
-msgstr "%s: versie-ingang met recnum %lu\n"
+msgstr "%s: version record with recnum %lu\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1226
 #, c-format
 msgid "%s: invalid file version %d\n"
-msgstr "%s: ongeldige bestandsversie %d\n"
+msgstr "%s: invalid file version %d\n"
 
-#: g10/tdbio.c:1406
+#: g10/tdbio.c:1411
 #, c-format
 msgid "%s: error reading free record: %s\n"
-msgstr "%s: fout bij lezen vrije ingang: %s\n"
+msgstr "%s: error reading free record: %s\n"
 
-#: g10/tdbio.c:1414
+#: g10/tdbio.c:1419
 #, c-format
 msgid "%s: error writing dir record: %s\n"
-msgstr "%s: fout bij schrijven map ingang: %s\n"
+msgstr "%s: error writing dir record: %s\n"
 
-#: g10/tdbio.c:1424
+#: g10/tdbio.c:1429
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
-msgstr "%s: op nul stellen van een ingang mislukt: %s\n"
+msgstr "%s: failed to zero a record: %s\n"
 
-#: g10/tdbio.c:1454
+#: g10/tdbio.c:1459
 #, c-format
 msgid "%s: failed to append a record: %s\n"
-msgstr "%s: achtervoegen van een ingang mislukt: %s\n"
+msgstr "%s: failed to append a record: %s\n"
 
-#: g10/tdbio.c:1499
+#: g10/tdbio.c:1504
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr ""
-"de trustdb is beschadigd; voer alstublieft \"gpg --fix-trustdb\" uit.\n"
+msgstr "the trustdb is corrupted; please run “gpg --fix-trustdb”.\n"
 
-#: g10/textfilter.c:134
+#: g10/textfilter.c:149
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
-msgstr "kan tekstregels langer dan %d tekens niet verwerken\n"
+msgstr "can't handle text lines longer than %d characters\n"
 
-#: g10/textfilter.c:231
+#: g10/textfilter.c:248
 #, c-format
 msgid "input line longer than %d characters\n"
-msgstr "invoerregel langer dan %d tekens\n"
+msgstr "input line longer than %d characters\n"
 
-#: g10/trustdb.c:226
+#: g10/trustdb.c:227
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
-msgstr "`%s' is geen geldige lange keyID\n"
+msgstr "‘%s’ is not a valid long keyID\n"
 
-#: g10/trustdb.c:257
-#, fuzzy, c-format
+#: g10/trustdb.c:258
+#, c-format
 msgid "key %s: accepted as trusted key\n"
-msgstr "sleutel %08lX: geaccepteerd als vertrouwde sleutel\n"
+msgstr "key %s: accepted as trusted key\n"
 
-#: g10/trustdb.c:295
-#, fuzzy, c-format
+#: g10/trustdb.c:296
+#, c-format
 msgid "key %s occurs more than once in the trustdb\n"
-msgstr "sleutel %08lX komt meerdere keren voor in de trustdb\n"
+msgstr "key %s occurs more than once in the trustdb\n"
 
-#: g10/trustdb.c:310
-#, fuzzy, c-format
+#: g10/trustdb.c:311
+#, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
-msgstr ""
-"sleutel %08lX: geen openbare sleutel voor vertrouwde sleutel - overgeslagen\n"
+msgstr "key %s: no public key for trusted key - skipped\n"
 
-#: g10/trustdb.c:320
-#, fuzzy, c-format
+#: g10/trustdb.c:321
+#, c-format
 msgid "key %s marked as ultimately trusted\n"
-msgstr "sleutel gemarkeerd als maximaal vertrouwd.\n"
+msgstr "key %s marked as ultimately trusted\n"
 
-#: g10/trustdb.c:344
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
-msgstr "vertrouwensingang %lu, req soort %d: lezen mislukt: %s\n"
+msgstr "trust record %lu, req type %d: read failed: %s\n"
 
-#: g10/trustdb.c:350
+#: g10/trustdb.c:351
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
-msgstr "vertrouwensingang %lu is niet van gevraagde soort %d\n"
+msgstr "trust record %lu is not of requested type %d\n"
 
-#: g10/trustdb.c:446
+#: g10/trustdb.c:447
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
-msgstr ""
+msgstr "unable to use unknown trust model (%d) - assuming %s trust model\n"
 
-#: g10/trustdb.c:452
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
-msgstr ""
+msgstr "using %s trust model\n"
+
+#: g10/trustdb.c:505
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgstr "10 translator see trustdb.c:uid_trust_string_fixed"
+
+#: g10/trustdb.c:507
+msgid "[ revoked]"
+msgstr "[ revoked]"
+
+#: g10/trustdb.c:509 g10/trustdb.c:514
+msgid "[ expired]"
+msgstr "[ expired]"
+
+#: g10/trustdb.c:513
+msgid "[ unknown]"
+msgstr "[ unknown]"
+
+#: g10/trustdb.c:515
+msgid "[  undef ]"
+msgstr "[  undef ]"
+
+#: g10/trustdb.c:516
+msgid "[marginal]"
+msgstr "[marginal]"
+
+#: g10/trustdb.c:517
+msgid "[  full  ]"
+msgstr "[  full  ]"
+
+#: g10/trustdb.c:518
+msgid "[ultimate]"
+msgstr "[ultimate]"
 
-#: g10/trustdb.c:501
+#: g10/trustdb.c:533
 msgid "undefined"
-msgstr ""
+msgstr "undefined"
 
-#: g10/trustdb.c:502
-#, fuzzy
+#: g10/trustdb.c:534
 msgid "never"
-msgstr "nooit"
+msgstr "never"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:535
 msgid "marginal"
-msgstr ""
+msgstr "marginal"
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:536
 msgid "full"
-msgstr ""
+msgstr "full"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:537
 msgid "ultimate"
-msgstr ""
+msgstr "ultimate"
 
-#: g10/trustdb.c:545
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
-msgstr "trustdb controle niet nodig\n"
+msgstr "no need for a trustdb check\n"
 
-#: g10/trustdb.c:551 g10/trustdb.c:2112
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, c-format
 msgid "next trustdb check due at %s\n"
-msgstr "volgende trustdb controle op %s\n"
+msgstr "next trustdb check due at %s\n"
 
-#: g10/trustdb.c:560
-#, fuzzy, c-format
+#: g10/trustdb.c:592
+#, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
-msgstr "trustdb controle niet nodig\n"
+msgstr "no need for a trustdb check with ‘%s’ trust model\n"
 
-#: g10/trustdb.c:575
-#, fuzzy, c-format
+#: g10/trustdb.c:607
+#, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
-msgstr "trustdb controle niet nodig\n"
+msgstr "no need for a trustdb update with ‘%s’ trust model\n"
 
-#: g10/trustdb.c:793 g10/trustdb.c:1231
-#, fuzzy, c-format
+#: g10/trustdb.c:839 g10/trustdb.c:1277
+#, c-format
 msgid "public key %s not found: %s\n"
-msgstr "openbare sleutel %08lX niet gevonden: %s\n"
+msgstr "public key %s not found: %s\n"
 
-#: g10/trustdb.c:988
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
-msgstr "doe alstublieft een --check-trustdb\n"
+msgstr "please do a --check-trustdb\n"
 
-#: g10/trustdb.c:992
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
-msgstr "bezig met controleren trustdb\n"
+msgstr "checking the trustdb\n"
 
-#: g10/trustdb.c:1856
+#: g10/trustdb.c:2095
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
-msgstr "%d sleutels verwerkt (%d geldigheidsgetallen gewist)\n"
+msgstr "%d keys processed (%d validity counts cleared)\n"
 
-#: g10/trustdb.c:1920
+#: g10/trustdb.c:2160
 msgid "no ultimately trusted keys found\n"
-msgstr "geen maximaal vertrouwde sleutels gevonden\n"
+msgstr "no ultimately trusted keys found\n"
 
-#: g10/trustdb.c:1934
-#, fuzzy, c-format
+#: g10/trustdb.c:2174
+#, c-format
 msgid "public key of ultimately trusted key %s not found\n"
-msgstr "openbare sleutel van maximaal vertrouwde sleutel %08lX niet gevonden\n"
+msgstr "public key of ultimately trusted key %s not found\n"
 
-#: g10/trustdb.c:1957
+#: g10/trustdb.c:2197
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
-msgstr ""
+msgstr "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 
-#: g10/trustdb.c:2043
+#: g10/trustdb.c:2283
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2118
-#, fuzzy, c-format
+#: g10/trustdb.c:2358
+#, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
-msgstr "vertrouwensingang %lu, soort %d: schrijven mislukt: %s\n"
+msgstr "unable to update trustdb version record: write failed: %s\n"
 
-#: g10/verify.c:116
+#: g10/verify.c:117
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
-"de ondertekening kon niet worden geverifieerd.\n"
-"Onthoud alstublieft dat het ondertekeningsbestand (.sig of .asc)\n"
-"als eerste moet worden gegevens op de opdrachtregel.\n"
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
 
-#: g10/verify.c:189
+#: g10/verify.c:192
 #, c-format
 msgid "input line %u too long or missing LF\n"
-msgstr "invoerregel %u te lang of mist LF (enter)\n"
+msgstr "input line %u too long or missing LF\n"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
-msgstr "algemene fout"
+msgstr "general error"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
-msgstr "onbekende pakketsoort"
+msgstr "unknown packet type"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
-msgstr "onbekende versie"
+msgstr "unknown version"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
-msgstr "onbekend openbare sleutel algoritme"
+msgstr "unknown pubkey algorithm"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
-msgstr "onbekend digest-algoritme"
+msgstr "unknown samenvattings algorithm"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
-msgstr "slechte openbare sleutel"
+msgstr "bad public key"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
-msgstr "slechte geheime sleutel"
+msgstr "bad secret key"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
-msgstr "slechte ondertekening"
+msgstr "bad signature"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
-msgstr "controlesom fout"
+msgstr "checksum error"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
-msgstr "slecht wachtwoord"
+msgstr "bad passphrase"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
-msgstr "openbare sleutel niet gevonden"
+msgstr "public key not found"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
-msgstr "onbekend codeeralgoritme"
+msgstr "unknown versleutelalgoritme"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
-msgstr "kan de sleutelbos niet openen"
+msgstr "can't open the keyring"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
-msgstr "ongeldig pakket"
+msgstr "invalid packet"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
-msgstr "ongeldige bepantsering"
+msgstr "invalid armor"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
-msgstr "onbekende gebruikerscode"
+msgstr "no such user id"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
-msgstr "geheime sleutel niet beschikbaar"
+msgstr "secret key not available"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
-msgstr "verkeerde geheime sleutel gebruikt"
+msgstr "wrong secret key used"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
-msgstr "niet ondersteund"
+msgstr "not supported"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
-msgstr "slechte sleutel"
+msgstr "bad key"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
-msgstr "bestandsleesfout"
+msgstr "file read error"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
-msgstr "bestandsschrijffout"
+msgstr "file write error"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
-msgstr "onbekend inpakalgoritme"
+msgstr "unknown compress algorithm"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
-msgstr "bestandsopenfout"
+msgstr "file open error"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
-msgstr "bestandsaanmaakfout"
+msgstr "file create error"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
-msgstr "ongeldig wachtwoord"
+msgstr "invalid passphrase"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
-msgstr "niet-geïmplementeerd openbare sleutel algoritme"
+msgstr "unimplemented pubkey algorithm"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
-msgstr "niet-geïmplementeerd codeeralgoritme"
+msgstr "unimplemented versleutelalgoritme"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
-msgstr "onbekende ondertekeningsklasse"
+msgstr "unknown signature class"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
-msgstr "vertrouwensgegevensbank fout"
+msgstr "trust database error"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
-msgstr "slechte MPI"
+msgstr "bad MPI"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
-msgstr "grens aan bronnen"
+msgstr "resource limit"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
-msgstr "ongeldige sleutelbos"
+msgstr "invalid keyring"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
-msgstr "slecht certificaat"
+msgstr "bad certificate"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
-msgstr "misvormde gebruikerscode"
+msgstr "malformed user id"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
-msgstr "bestandssluitfout"
+msgstr "file close error"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
-msgstr "bestandshernoemfout"
+msgstr "file rename error"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
-msgstr "bestandsverwijderfout"
+msgstr "file delete error"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
-msgstr "onverwachte gegevens"
+msgstr "unexpected data"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
-msgstr "tijdsstempel conflict"
+msgstr "timestamp conflict"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
-msgstr "onbruikbar openbare sleutel algoritme"
+msgstr "unusable pubkey algorithm"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
-msgstr "bestand bestaat"
+msgstr "file exists"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
-msgstr "zwakke sleutel"
+msgstr "weak key"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
-msgstr "ongeldig argument"
+msgstr "invalid argument"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
-msgstr "slechte URI"
+msgstr "bad URI"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
-msgstr "niet-ondersteunde URI"
+msgstr "unsupported URI"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
-msgstr "netwerkfout"
+msgstr "network error"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
-msgstr "niet gecodeerd"
+msgstr "not encrypted"
 
-#: util/errors.c:103
+#: util/errors.c:104
 msgid "not processed"
-msgstr "niet verwerkt"
+msgstr "not processed"
 
-#: util/errors.c:105
+#: util/errors.c:106
 msgid "unusable public key"
-msgstr "onbruikbare openbare sleutel"
+msgstr "unusable public key"
 
-#: util/errors.c:106
+#: util/errors.c:107
 msgid "unusable secret key"
-msgstr "onbruikbare geheime sleutel"
+msgstr "unusable secret key"
 
-#: util/errors.c:107
+#: util/errors.c:108
 msgid "keyserver error"
-msgstr "sleutelserverfout"
+msgstr "keyserver error"
 
-#: util/errors.c:108
-#, fuzzy
+#: util/errors.c:109
 msgid "canceled"
-msgstr "Annuleren"
+msgstr "canceled"
 
-#: util/errors.c:109
-#, fuzzy
+#: util/errors.c:110
 msgid "no card"
-msgstr "niet gecodeerd"
+msgstr "no card"
+
+#: util/errors.c:111
+msgid "no data"
+msgstr "no data"
 
-#: util/logger.c:157
+#: util/logger.c:158
 msgid "ERROR: "
-msgstr ""
+msgstr "ERROR: "
 
-#: util/logger.c:160
+#: util/logger.c:161
 msgid "WARNING: "
-msgstr ""
+msgstr "WARNING: "
 
-#: util/logger.c:223
+#: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "... dit is een softwarefout (%s:%d:%s)\n"
+msgstr "... this is a bug (%s:%d:%s)\n"
 
-#: util/logger.c:229
+#: util/logger.c:230
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
-msgstr "u heeft een softwarefout gevonden ... (%s:%d)\n"
+msgstr "you found a bug ... (%s:%d)\n"
 
-#: util/miscutil.c:307 util/miscutil.c:344
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: util/miscutil.c:330 util/miscutil.c:367
 msgid "yes"
-msgstr "ja"
+msgstr "yes|ja"
 
-#: util/miscutil.c:308 util/miscutil.c:349
+#: util/miscutil.c:331 util/miscutil.c:372
 msgid "yY"
-msgstr "jJ"
+msgstr "yYjJ"
 
-#: util/miscutil.c:310 util/miscutil.c:346
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: util/miscutil.c:333 util/miscutil.c:369
 msgid "no"
 msgstr "nee"
 
-#: util/miscutil.c:311 util/miscutil.c:350
+#: util/miscutil.c:334 util/miscutil.c:373
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:351
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: util/miscutil.c:371
+msgid "quit"
+msgstr "stoppen"
+
+#: util/miscutil.c:374
 msgid "qQ"
-msgstr "qQ"
+msgstr "sS"
 
-#: util/miscutil.c:384
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: util/miscutil.c:407
 msgid "okay|okay"
-msgstr ""
+msgstr "okay|okay"
 
-#: util/miscutil.c:386
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: util/miscutil.c:409
 msgid "cancel|cancel"
-msgstr ""
+msgstr "cancel|cancel"
 
-#: util/miscutil.c:387
+#: util/miscutil.c:410
 msgid "oO"
-msgstr ""
+msgstr "oO"
 
-#: util/miscutil.c:388
-#, fuzzy
+#: util/miscutil.c:411
 msgid "cC"
-msgstr "c"
+msgstr "cC"
 
-#: util/secmem.c:90
+#: util/secmem.c:97
 msgid "WARNING: using insecure memory!\n"
-msgstr "WAARSCHUWING: er wordt onveilig geheugen gebruikt!\n"
+msgstr "WARNING: using insecure memory!\n"
 
-#: util/secmem.c:91
+#: util/secmem.c:98
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
-msgstr "zie alstublieft http://www.gnupg.org/faq.html voor meer informatie\n"
+msgstr "please see http://www.gnupg.org/faq.html for more information\n"
 
-#: util/secmem.c:340
+#: util/secmem.c:351
 msgid "operation is not possible without initialized secure memory\n"
-msgstr "bewerking is niet mogelijk zonder geïnitialiseerd veilig geheugen\n"
+msgstr "operation is not possible without initialized secure memory\n"
 
-#: util/secmem.c:341
+#: util/secmem.c:352
 msgid "(you may have used the wrong program for this task)\n"
-msgstr "(mogelijk heeft u het verkeerde programma gebruikt voor deze taak)\n"
-
-#, fuzzy
-#~ msgid "writing to file `%s'\n"
-#~ msgstr "bezig met schrijven naar `%s'\n"
-
-#~ msgid "sorry, can't do this in batch mode\n"
-#~ msgstr "sorry, dat kan niet in batch-modus\n"
-
-#~ msgid "key `%s' not found: %s\n"
-#~ msgstr "sleutel `%s' niet gevonden: %s\n"
-
-#, fuzzy
-#~ msgid "can't create file `%s': %s\n"
-#~ msgstr "kan `%s' niet aanmaken: %s\n"
-
-#, fuzzy
-#~ msgid "can't open file `%s': %s\n"
-#~ msgstr "kan bestand niet openen: %s\n"
-
-#, fuzzy
-#~ msgid "          \""
-#~ msgstr "                alias \""
-
-#~ msgid " i = please show me more information\n"
-#~ msgstr " i = meer informatie weergeven\n"
-
-#~ msgid "key %08lX: key has been revoked!\n"
-#~ msgstr "sleutel %08lX: sleutel is herroepen!\n"
-
-#~ msgid "key %08lX: subkey has been revoked!\n"
-#~ msgstr "sleutel %08lX: deelsleutel is herroepen!\n"
-
-#~ msgid "%08lX: key has expired\n"
-#~ msgstr "%08lX: sleutel is verlopen\n"
-
-#~ msgid "%08lX: We do NOT trust this key\n"
-#~ msgstr "%08lX: We vertrouwen deze sleutel NIET\n"
-
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (ondertekenen en coderen)\n"
-
-#, fuzzy
-#~ msgid "   (%d) RSA (auth only)\n"
-#~ msgstr "   (%d) RSA (alleen ondertekenen)\n"
-
-#, fuzzy
-#~ msgid "   (%d) RSA (sign and auth)\n"
-#~ msgstr "   (%d) RSA (ondertekenen en coderen)\n"
-
-#, fuzzy
-#~ msgid "   (%d) RSA (encrypt and auth)\n"
-#~ msgstr "   (%d) RSA (alleen coderen)\n"
-
-#, fuzzy
-#~ msgid "  (%d) RSA (sign, encrypt and auth)\n"
-#~ msgstr "   (%d) RSA (ondertekenen en coderen)\n"
-
-#~ msgid "%s: can't open: %s\n"
-#~ msgstr "%s: kan niet openen: %s\n"
-
-#~ msgid "%s: WARNING: empty file\n"
-#~ msgstr "%s: WAARSCHUWING: leeg bestand\n"
-
-#~ msgid "can't open %s: %s\n"
-#~ msgstr "kan %s niet openen: %s\n"
-
-#, fuzzy
-#~ msgid "   (%d) I trust marginally\n"
-#~ msgstr " %d = Ik vertrouw een beetje\n"
-
-#, fuzzy
-#~ msgid "   (%d) I trust fully\n"
-#~ msgstr " %d = Ik vertrouw volledig\n"
-
-#, fuzzy
-#~ msgid "expires"
-#~ msgstr "expire"
-
-#, fuzzy
-#~ msgid ""
-#~ "\"\n"
-#~ "locally signed with your key %s at %s\n"
-#~ msgstr ""
-#~ "\"\n"
-#~ "lokaal ondertekend met uw sleutel %08lX op %s\n"
-
-#, fuzzy
-#~ msgid "   signed by %s on %s%s\n"
-#~ msgstr "   ondertekend door %08lX op %s%s\n"
-
-#~ msgid "%s: can't access: %s\n"
-#~ msgstr "%s: kan niet benaderen: %s\n"
-
-#~ msgid "%s: can't create lock\n"
-#~ msgstr "%s: kan geen blokkering aanmaken\n"
-
-#~ msgid "%s: can't make lock\n"
-#~ msgstr "%s: kan geen blokkering maken\n"
-
-#~ msgid "%s: can't create: %s\n"
-#~ msgstr "%s: kan niet aanmaken: %s\n"
-
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s: kan map niet aanmaken: %s\n"
-
-#~ msgid "If you want to use this revoked key anyway, answer \"yes\"."
-#~ msgstr "Antwoord \"ja\" als u toch deze herroepen sleutel wilt gebruiken."
-
-#~ msgid "Unable to open photo \"%s\": %s\n"
-#~ msgstr "Kan foto \"%s\" niet openen: %s\n"
-
-#~ msgid "can't open file: %s\n"
-#~ msgstr "kan bestand niet openen: %s\n"
-
-#~ msgid "error: missing colon\n"
-#~ msgstr "fout: ontbrekende dubbele punt\n"
-
-#~ msgid "error: no ownertrust value\n"
-#~ msgstr "fout: geen eigenaarsvertrouwen waarde\n"
-
-#~ msgid " (main key ID %08lX)"
-#~ msgstr " (hoofdsleutel ID %08lX)"
-
-#~ msgid "rev! subkey has been revoked: %s\n"
-#~ msgstr "herroepen! deelsleutel is herroepen: %s\n"
-
-#~ msgid "rev- faked revocation found\n"
-#~ msgstr "herroepen- vervalste herroeping gevonden\n"
-
-#~ msgid "rev? problem checking revocation: %s\n"
-#~ msgstr "herroepen? probleem bij controleren herroeping: %s\n"
-
-#~ msgid "[revoked] "
-#~ msgstr "[herroepen] "
-
-#~ msgid "[expired] "
-#~ msgstr "[verlopen] "
-
-#, fuzzy
-#~ msgid " [expired: %s]"
-#~ msgstr " [verloopt: %s]"
-
-#~ msgid " [expires: %s]"
-#~ msgstr " [verloopt: %s]"
-
-#, fuzzy
-#~ msgid " [revoked: %s]"
-#~ msgstr "[herroepen] "
-
-#~ msgid "can't create %s: %s\n"
-#~ msgstr "kan %s niet aanmaken: %s\n"
-
-#~ msgid "|[files]|encrypt files"
-#~ msgstr "|[bestanden]|bestanden coderen"
-
-#~ msgid "store only"
-#~ msgstr "alleen opslaan"
-
-#~ msgid "|[files]|decrypt files"
-#~ msgstr "|[bestanden]|bestanden decoderen"
-
-#~ msgid "sign a key non-revocably"
-#~ msgstr "een sleutel onherroepbaar ondertekenen"
-
-#~ msgid "sign a key locally and non-revocably"
-#~ msgstr "een sleutel lokaal en onherroepbaar ondertekenen"
-
-#~ msgid "list only the sequence of packets"
-#~ msgstr "slechts de reeks van pakketten opsommen"
-
-#~ msgid "export the ownertrust values"
-#~ msgstr "de eigenaarsvertrouwen-waarden uitvoeren"
-
-#~ msgid "unattended trust database update"
-#~ msgstr "automatische vertrouwensgegevensbank bijwerking"
-
-#~ msgid "fix a corrupted trust database"
-#~ msgstr "een kapotte vertrouwensgegevensbank repareren"
-
-#~ msgid "De-Armor a file or stdin"
-#~ msgstr "Een bestand of standaardinvoer ontpantseren"
-
-#~ msgid "En-Armor a file or stdin"
-#~ msgstr "Een bestand of standaardinvoer bepantseren"
-
-#~ msgid "|NAME|use NAME as default recipient"
-#~ msgstr "|NAAM|NAAM gebruiken als standaardontvanger"
-
-#~ msgid "use the default key as default recipient"
-#~ msgstr "de standaardsleutel gebruiken als standaardontvanger"
-
-#~ msgid "don't use the terminal at all"
-#~ msgstr "helemaal niet de terminal gebruiken"
-
-#~ msgid "force v3 signatures"
-#~ msgstr "versie 3 ondertekeningen afdwingen"
-
-#~ msgid "do not force v3 signatures"
-#~ msgstr "niet versie 3 ondertekeningen afdwingen"
-
-#~ msgid "force v4 key signatures"
-#~ msgstr "versie 4 sleutelondertekeningen afdwingen"
-
-#~ msgid "do not force v4 key signatures"
-#~ msgstr "niet versie 4 sleutelondertekeningen afdwingen"
-
-#~ msgid "always use a MDC for encryption"
-#~ msgstr "altijd een MDC gebruiken voor codering"
-
-#~ msgid "never use a MDC for encryption"
-#~ msgstr "nooit een MDC gebruiken voor codering"
-
-#~ msgid "use the gpg-agent"
-#~ msgstr "de gpg-agent gebruiken"
-
-#~ msgid "batch mode: never ask"
-#~ msgstr "batch-modus: nooit vragen"
-
-#~ msgid "assume yes on most questions"
-#~ msgstr "ja aannemen bij de meeste vragen"
-
-#~ msgid "assume no on most questions"
-#~ msgstr "nee aannemen bij de meeste vragen"
-
-#~ msgid "add this keyring to the list of keyrings"
-#~ msgstr "deze sleutelbos toevoegen aan de lijst van sleutelbossen"
-
-#~ msgid "add this secret keyring to the list"
-#~ msgstr "deze geheime sleutelbos toevoegen aan de lijst"
-
-#~ msgid "show which keyring a listed key is on"
-#~ msgstr "weergeven op welke sleutelbos een opgesomde sleutel zit"
-
-#~ msgid "|NAME|use NAME as default secret key"
-#~ msgstr "|NAAM|NAAM gebruiken als standaard geheime sleutel"
-
-#~ msgid "|HOST|use this keyserver to lookup keys"
-#~ msgstr "|HOST|deze sleutelserver gebruiken om sleutels op te zoeken"
-
-#~ msgid "|NAME|set terminal charset to NAME"
-#~ msgstr "|NAAM|terminal tekenset instellen op NAAM"
-
-#~ msgid "read options from file"
-#~ msgstr "opties lezen uit een bestand"
-
-#~ msgid "|[file]|write status info to file"
-#~ msgstr "|[bestand]|statusinfo naar dit bestand schrijven"
-
-#~ msgid "|KEYID|ultimately trust this key"
-#~ msgstr "|SLEUTEL|deze sleutel maximaal vertrouwen"
-
-#~ msgid "|FILE|load extension module FILE"
-#~ msgstr "|BESTAND|uitbreidingsmodule BESTAND laden"
-
-#~ msgid "emulate the mode described in RFC1991"
-#~ msgstr "de modus beschreven in RFC1991 emuleren"
-
-#~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
-#~ msgstr ""
-#~ "alles pakket-, codering- en digestopties instellen op OpenPGP gedrag"
-
-#~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
-#~ msgstr "alle pakket-, codering- en digestopties instellen op PGP 2.x gedrag"
-
-#~ msgid "|N|use passphrase mode N"
-#~ msgstr "|N|wachtwoordmodus N gebruiken"
-
-#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
-#~ msgstr "|NAAM|berichtdigest-algoritme NAAM gebruiken voor wachtwoorden"
-
-#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
-#~ msgstr "|NAAM|codeeralgoritme NAAM gebruiken voor wachtwoorden"
-
-#~ msgid "|NAME|use cipher algorithm NAME"
-#~ msgstr "|NAAM|codeeralgoritme NAAM gebruiken"
-
-#~ msgid "|NAME|use message digest algorithm NAME"
-#~ msgstr "|NAAM|berichtdigest-algoritme NAAM gebruiken"
-
-#~ msgid "|N|use compress algorithm N"
-#~ msgstr "|N|inpakalgoritme N gebruiken"
-
-#~ msgid "throw keyid field of encrypted packets"
-#~ msgstr "keyid-veld uit gecodeerde pakketten gooien"
-
-#~ msgid "Show Photo IDs"
-#~ msgstr "Foto's weergeven"
-
-#~ msgid "Don't show Photo IDs"
-#~ msgstr "Niet foto's weergeven"
-
-#~ msgid "Set command line to view Photo IDs"
-#~ msgstr "Opdrachtregel instellen voor weergeven van foto's"
-
-#, fuzzy
-#~ msgid "compress algorithm `%s' is read-only in this release\n"
-#~ msgstr "digest-algoritme `%s' is alleen-lezen in deze uitgave\n"
-
-#~ msgid "compress algorithm must be in range %d..%d\n"
-#~ msgstr "inpakalgoritme moet binnen bereik %d..%d liggen\n"
-
-#~ msgid ""
-#~ "%08lX: It is not sure that this key really belongs to the owner\n"
-#~ "but it is accepted anyway\n"
-#~ msgstr ""
-#~ "%08lX: Het is niet zeker dat deze sleutel echt van de eigenaar is,\n"
-#~ "maar de sleutel is toch geaccepteerd\n"
-
-#~ msgid "preference %c%lu is not valid\n"
-#~ msgstr "voorkeur %c%lu is niet geldig\n"
-
-#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
-#~ msgstr "sleutel %08lX: niet een rfc2440 sleutel - overgeslagen\n"
-
-#~ msgid ""
-#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
-#~ msgstr ""
-#~ "LET OP: Elgamal primaire sleutel gevonden - het invoeren kan even duren\n"
-
-#~ msgid " (default)"
-#~ msgstr " (standaard)"
-
-#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
-#~ msgstr "%s%c %4u%c/%08lX  gemaakt: %s verloopt: %s"
-
-#~ msgid "Notation: "
-#~ msgstr "Notatie: "
-
-#~ msgid "Policy: "
-#~ msgstr "Beleid: "
-
-#~ msgid "can't get key from keyserver: %s\n"
-#~ msgstr "kan sleutel niet ontvangen van sleutelserver: %s\n"
-
-#~ msgid "error sending to `%s': %s\n"
-#~ msgstr "fout bij verzenden aan `%s': %s\n"
-
-#~ msgid "success sending to `%s' (status=%u)\n"
-#~ msgstr "succes bij zenden aan `%s' (status=%u)\n"
-
-#~ msgid "failed sending to `%s': status=%u\n"
-#~ msgstr "verzenden aan `%s' mislukt: status=%u\n"
-
-#~ msgid "can't search keyserver: %s\n"
-#~ msgstr "kan niet zoeken op sleutelserver: %s\n"
-
-#~ msgid ""
-#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
-#~ "signatures!\n"
-#~ msgstr ""
-#~ "sleutel %08lX: dit is een met PGP aangemaakte ElGamal-sleutel die NIET "
-#~ "veilig is voor ondertekeningen!\n"
-
-#~ msgid ""
-#~ "key %08lX has been created %lu second in future (time warp or clock "
-#~ "problem)\n"
-#~ msgstr ""
-#~ "sleutel %08lX is %lu seconde in de toekomst gemaakt (tijdsreis of "
-#~ "klokprobleem)\n"
-
-#~ msgid ""
-#~ "key %08lX has been created %lu seconds in future (time warp or clock "
-#~ "problem)\n"
-#~ msgstr ""
-#~ "sleutel %08lX is %lu seconden in de toekomst gemaakt (tijdsreis of "
-#~ "klokprobleem)\n"
-
-#~ msgid "key %08lX marked as ultimately trusted\n"
-#~ msgstr "sleutel %08lX gemarkeerd als maximaal vertrouwd\n"
-
-#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
-#~ msgstr ""
-#~ "bezig met controleren op diepte %d ondertekend=%d ot(-/q/n/m/f/u)=%d/%d/%"
-#~ "d/%d/%d/%d\n"
-
-#~ msgid ""
-#~ "Select the algorithm to use.\n"
-#~ "\n"
-#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
-#~ "for signatures.  This is the suggested algorithm because verification of\n"
-#~ "DSA signatures are much faster than those of ElGamal.\n"
-#~ "\n"
-#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
-#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
-#~ "only\n"
-#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
-#~ "selected in a special way to create a safe key for signatures: this "
-#~ "program\n"
-#~ "does this but other OpenPGP implementations are not required to "
-#~ "understand\n"
-#~ "the signature+encryption flavor.\n"
-#~ "\n"
-#~ "The first (primary) key must always be a key which is capable of "
-#~ "signing;\n"
-#~ "this is the reason why the encryption only ElGamal key is not available "
-#~ "in\n"
-#~ "this menu."
-#~ msgstr ""
-#~ "Kies het te gebruiken algoritme.\n"
-#~ "\n"
-#~ "DSA (ofwel DSS) is het digitale ondertekening algoritme dat alleen kan\n"
-#~ "worden gebruikt voor ondertekeningen.  Dit is het voorgestelde algoritme\n"
-#~ "omdat verificatie van DSA-ondertekeningen veel sneller is dan van "
-#~ "ElGamal.\n"
-#~ "\n"
-#~ "ElGamal is een algoritme dat kan worden gebruikt voor ondertekenen en\n"
-#~ "coderen. OpenPGP onderscheidt twee smaken van dit algoritme: een alleen-\n"
-#~ "coderen en een coderen+coderen versie; ze zijn eigenlijk hetzelfde, maar\n"
-#~ "sommige parameters moeten op een speciale manier worden gekozen\n"
-#~ "om veilige sleutels voor ondertekenen te maken: dit programma\n"
-#~ "doet dit maar andere OpenPGP-implementaties hoeven de coderen+\n"
-#~ "ondertekenen smaak niet te begrijpen.\n"
-#~ "\n"
-#~ "De eerste (primaire) sleutel moet altijd een sleutel zijn waarmee kan\n"
-#~ "ondertekend kan worden; dit is de reden dat de alleen-coderen ElGamal-\n"
-#~ "sleutel niet beschikbaar is in dit menu."
-
-#~ msgid ""
-#~ "Although these keys are defined in RFC2440 they are not suggested\n"
-#~ "because they are not supported by all programs and signatures created\n"
-#~ "with them are quite large and very slow to verify."
-#~ msgstr ""
-#~ "Ondanks dat deze sleutels gedefinieerd zijn in RFC2440 worden ze niet\n"
-#~ "aangeraden omdat ze niet door alle programma's worden ondersteund\n"
-#~ "en omdat de ondertekeningen die ermee worden gemaakt behoorlijk\n"
-#~ "groot zijn en traag om te verifiëren."
-
-#~ msgid "%lu keys so far checked (%lu signatures)\n"
-#~ msgstr "tot nu toe %lu sleutels gecontroleerd (%lu ondertekeningen)\n"
-
-#~ msgid "key incomplete\n"
-#~ msgstr "sleutel onvolledig\n"
-
-#~ msgid "key %08lX incomplete\n"
-#~ msgstr "sleutel %08lX onvolledig\n"
-
-#~ msgid "   (%d) ElGamal (sign and encrypt)\n"
-#~ msgstr "   (%d) ElGamal (ondertekenen en coderen)\n"
-
-#~ msgid ""
-#~ "The use of this algorithm is only supported by GnuPG.  You will not be\n"
-#~ "able to use this key to communicate with PGP users.  This algorithm is "
-#~ "also\n"
-#~ "very slow, and may not be as secure as the other choices.\n"
-#~ msgstr ""
-#~ "Het gebruik van dit algoritme wordt alleen ondersteund door GnuPG.  U "
-#~ "zult met\n"
-#~ "deze sleutel niet kunnen communiceren met PGP gebruikers.  Dit algoritme "
-#~ "is\n"
-#~ "ook erg langzaam, en mogelijk niet zo veilig als de andere keuzes.\n"
-
-#~ msgid "Create anyway? "
-#~ msgstr "Toch aanmaken? "
-
-#~ msgid "this keyserver is not fully HKP compatible\n"
-#~ msgstr "deze sleutelserver is niet helemaal HKP-compatibel\n"
+msgstr "(you may have used the wrong program for this task)\n"
diff --git a/po/pl.po b/po/pl.po
index 70d588372..71c35293d 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: [email protected]\n"
-"POT-Creation-Date: 2006-12-04 15:05+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2004-06-23 15:54+0200\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -50,10 +50,10 @@ msgstr "zapisuj� klucz tajny w '%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
+#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -87,9 +87,9 @@ msgstr "nie mo�na odczyta� ,,%s'': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "uwaga: plik random_seed nie jest uaktualniony\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
+#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
+#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
@@ -410,15 +410,15 @@ msgstr "brak klucza prywatnego"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
+#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "nie dzia�a w trybie wsadowym\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
+#: g10/keygen.c:1456
 msgid "Your selection? "
 msgstr "Tw�j wyb�r? "
 
@@ -598,8 +598,8 @@ msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
+#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Niew�a�ciwy wyb�r.\n"
 
@@ -623,7 +623,7 @@ msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 msgid "secret key already stored on a card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1319 g10/keyedit.c:1351
 msgid "quit this menu"
 msgstr "wyj�cie z tego menu"
 
@@ -632,7 +632,7 @@ msgstr "wyj�cie z tego menu"
 msgid "show admin commands"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1322 g10/keyedit.c:1354
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
@@ -689,7 +689,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1457 g10/keyedit.c:1617
 msgid "Command> "
 msgstr "Polecenie> "
 
@@ -708,7 +708,7 @@ msgstr "sprzeczne polecenia\n"
 msgid "Admin commands are not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1602 g10/keyedit.c:2238
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
 
@@ -766,7 +766,7 @@ msgstr "Powt�rz has�o: "
 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:3868 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -776,7 +776,7 @@ msgstr "nie mo�na otworzy� ,,%s''\n"
 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:3392 g10/keyserver.c:1705
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3386 g10/keyserver.c:1705
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -825,7 +825,7 @@ msgstr "dla klucza publicznego ,,%s'' istnieje klucz prywatny!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "aby go usun�� nalezy najpierw u�y� opcji \"--delete-secret-key\".\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:213 g10/sign.c:1286
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
@@ -894,12 +894,12 @@ msgstr "%s nie jest dost�pne w trybie %s\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s zaszyfrowany dla: ,,%s''\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:292
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dane zaszyfrowano za pomoc� %s\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:296
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
@@ -1042,7 +1042,7 @@ msgstr "OSTRZE�ENIE: klucz prywatny %08lX nie ma prostej sumy kontrolnej SK.\n"
 msgid "WARNING: nothing exported\n"
 msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:379
 msgid ""
 "@Commands:\n"
 " "
@@ -1050,128 +1050,128 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/gpg.c:380
+#: g10/gpg.c:381
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu pod dokumentem"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:383
 msgid "make a detached signature"
 msgstr "z�o�enie podpisu oddzielonego od dokumentu"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lne)"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:394
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpis�w"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "sprawdzenie podpis�w kluczy"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "list secret keys"
 msgstr "lista kluczy prywatnych"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "generate a new key pair"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "remove keys from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "remove keys from the secret keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy prywatnych"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "sign a key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "sign a key locally"
 msgstr "z�o�enie prywatnego podpisu na kluczu"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:404
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "generate a revocation certificate"
 msgstr "tworzenie certyfikatu uniewa�nienia klucza"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:408
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:409
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "search for keys on a key server"
 msgstr "szukanie kluczy na serwerze"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:413
 msgid "update all keys from a keyserver"
 msgstr "od�wie�enie wszystkich kluczy z serwera"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:417
 msgid "import/merge keys"
 msgstr "import/do��czenie kluczy"
 
-#: g10/gpg.c:419
+#: g10/gpg.c:420
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:421
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:422
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/gpg.c:437
+#: g10/gpg.c:438
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/gpg.c:441 g10/gpgv.c:71
+#: g10/gpg.c:442 g10/gpgv.c:70
 msgid ""
 "@\n"
 "Options:\n"
@@ -1181,51 +1181,51 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "create ascii armored output"
 msgstr "opakowanie ASCII pliku wynikowego"
 
-#: g10/gpg.c:445
+#: g10/gpg.c:446
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:458
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - bez)"
 
-#: g10/gpg.c:462
+#: g10/gpg.c:463
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:477
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/gpg.c:478 g10/gpgv.c:73
+#: g10/gpg.c:479 g10/gpgv.c:72
 msgid "verbose"
 msgstr "z dodatkowymi informacjami"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:491
 msgid "prompt before overwriting"
 msgstr "pytanie przed nadpisaniem plik�w"
 
-#: g10/gpg.c:531
+#: g10/gpg.c:532
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:532
+#: g10/gpg.c:533
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1233,7 +1233,7 @@ msgstr ""
 "@\n"
 "(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
 
-#: g10/gpg.c:564
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1254,15 +1254,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/gpg.c:763 g10/gpgv.c:98
+#: g10/gpg.c:766 g10/gpgv.c:97
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:783
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1272,7 +1272,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/gpg.c:794
+#: g10/gpg.c:797
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1280,73 +1280,73 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid "Pubkey: "
 msgstr "Asymetryczne: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2310
+#: g10/gpg.c:806 g10/keyedit.c:2304
 msgid "Cipher: "
 msgstr "Symetryczne: "
 
-#: g10/gpg.c:809
+#: g10/gpg.c:812
 msgid "Hash: "
 msgstr "Skr�t�w: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2356
+#: g10/gpg.c:818 g10/keyedit.c:2350
 msgid "Compression: "
 msgstr "Kompresji: "
 
-#: g10/gpg.c:898
+#: g10/gpg.c:901
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/gpg.c:1046
+#: g10/gpg.c:1049
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1067
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1264
 #, 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:1264
+#: g10/gpg.c:1267
 #, 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:1267
+#: g10/gpg.c:1270
 #, 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:1273
+#: g10/gpg.c:1276
 #, 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:1276
+#: g10/gpg.c:1279
 #, 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:1279
+#: g10/gpg.c:1282
 #, 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:1285
+#: g10/gpg.c:1288
 #, 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:1288
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1354,21 +1354,21 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, 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:1297
+#: g10/gpg.c:1300
 #, 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:1300
+#: g10/gpg.c:1303
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1376,496 +1376,501 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, 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:1444
+#: g10/gpg.c:1447
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nieznana opcja ,,%s''\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "okazanie, w kt�rym zbiorze znajduje si� dany klucz"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/gpg.c:1954
+#: g10/gpg.c:1957
 #, 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:1996
+#: g10/gpg.c:1999
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
 
-#: g10/gpg.c:2000
+#: g10/gpg.c:2003
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji ,,%s'': %s\n"
 
-#: g10/gpg.c:2007
+#: g10/gpg.c:2010
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/gpg.c:2236
+#: g10/gpg.c:2239
 #, 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:2402 g10/gpg.c:2414
+#: g10/gpg.c:2405 g10/gpg.c:2417
 #, 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:2491
+#: g10/gpg.c:2494
 #, 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:2515 g10/gpg.c:2702 g10/keyedit.c:4069
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2610
 #, 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:2768
+#: g10/gpg.c:2773
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2771
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/gpg.c:2858
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w po��czeniu z %s!\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2875
 #, 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:2880
+#: g10/gpg.c:2890
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/gpg.c:2894
+#: g10/gpg.c:2904
 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:2900
+#: g10/gpg.c:2910
 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:2906
+#: g10/gpg.c:2916
 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:2919
+#: g10/gpg.c:2929
 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:2986 g10/gpg.c:3010
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:2992 g10/gpg.c:3016
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/gpg.c:2998
+#: g10/gpg.c:3008
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:3004
+#: g10/gpg.c:3014
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3029
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3031
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3033
 #, 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:3025
+#: g10/gpg.c:3035
 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:3027
+#: g10/gpg.c:3037
 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:3030
+#: g10/gpg.c:3040
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3044
 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:3041
+#: g10/gpg.c:3051
 msgid "invalid default preferences\n"
 msgstr "niew�a�ciwe domy�lne ustawienia\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3060
 msgid "invalid personal cipher preferences\n"
 msgstr "niew�a�ciwe ustawienia szyfr�w\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3064
 msgid "invalid personal digest preferences\n"
 msgstr "niew�a�ciwe ustawienia skr�t�w\n"
 
-#: g10/gpg.c:3058
+#: g10/gpg.c:3068
 msgid "invalid personal compress preferences\n"
 msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
 
-#: g10/gpg.c:3091
+#: g10/gpg.c:3101
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie dzia�a z %s!\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3148
 #, 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:3143
+#: g10/gpg.c:3153
 #, 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:3148
+#: g10/gpg.c:3158
 #, 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:3250
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3271
 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:3272
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3291
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3314
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3306
+#: g10/gpg.c:3316
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3319
 #, 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:3327
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3365
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3367
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3370
 #, 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:3380
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3426
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/gpg.c:3560
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3572
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3564
+#: g10/gpg.c:3574
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3585
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3595
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3644
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,%s'\n"
 
-#: g10/gpg.c:3854
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/gpg.c:3858
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4172
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4174
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4207
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
@@ -1891,42 +1896,42 @@ 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:2380 g10/keyedit.c:3712
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, 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:2611
+#: g10/getkey.c:2614
 #, 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:2658
+#: g10/getkey.c:2661
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pomini�ty\n"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:73
 msgid "be somewhat more quiet"
 msgstr "mniej komunikat�ww"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "take the keys from this keyring"
 msgstr "pobieranie kluczy z tego zbioru"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:76
 msgid "make timestamp conflicts only a warning"
 msgstr "nie traktowa� konfliktu datownik�w jako b��du"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:77
 msgid "|FD|write status info to this FD"
 msgstr "|FD|pisanie opisu stanu do deskryptora FD"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:101
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpgv [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:104
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2450,7 +2455,7 @@ msgstr "klucz %08lX: nowy klucz - pomini�ty\n"
 msgid "no writable keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
@@ -2813,42 +2818,42 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
+#: g10/keyedit.c:890 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Czy na pewno chcesz podpisa�? (t/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
+#: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr " Nie da si� z�o�y� podpisu.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Identyfikator u�ytkownika ,,%s'' przekroczy� sw�j termin wa�no�ci."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Identyfikator ,,%s'' nie jest podpisany swoim kluczem."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Identyfikator ,,%s'' nie jest podpisany swoim kluczem."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2857,11 +2862,11 @@ msgstr ""
 "Podpis klucza nim samym na ,,%s''\n"
 "jest podpisem z�o�onym przez PGP 2.x.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Czy chcesz zamieni� go na podpis OpenPGP? (t/N) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2870,11 +2875,11 @@ msgstr ""
 "Tw�j podpis na \"%s\"\n"
 "przekroczy� dat� wa�no�ci.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Czy chcesz zast�pi� przeterminowany podpis nowym? (t/N) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2883,56 +2888,56 @@ msgstr ""
 "Tw�j podpis na \"%s\"\n"
 "jest podpisem prywatnym (lokalnym).\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Czy chcesz zamieni� go na pe�ny, publiczny, eksportowalny podpis? (t/N) "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" jest ju� lokalnie podpisany kluczem %08lX\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" jest ju� podpisany kluczem %08lX\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Czy na pewno chcesz to podpisa�? (t/N) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nie ma nic do podpisania kluczem %08lX.\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Data wa�no�ci tego klucza up�yn�a!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Wa�no�� tego klucza wygasa %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "Czy chcesz �eby wa�no�� Twojego podpisu wygasa�a w tej samej chwili? (T/n) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:883
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "W trybie --pgp2 nie mo�na podpisywa� kluczy PGP 2.x podpisami OpenPGP.\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:885
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "To uczyni ten klucz nieuzytecznym dla PGP 2.x.\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:910
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2941,32 +2946,32 @@ msgstr ""
 "Jak dok�adnie zosta�a przez Ciebie sprawdzona to�samo�� tej osoby?\n"
 "Je�li nie wiesz co odpowiedzie�, podaj ,,0''.\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nie odpowiem na to pytanie. %s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) W og�le nie.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Pobie�nie.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Bardzo dok�adnie.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:927
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Tw�j wyb�r (,,?'' podaje wi�cej informacji): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:951
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2975,99 +2980,99 @@ msgstr ""
 "Czy jeste� naprawd� pewien �e chcesz podpisa� ten klucz \n"
 "swoim kluczem: \""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:958
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "To b�dzie podpis klucza nim samym.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "OSTRZE�ENIE: podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:972
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "OSTRZE�ENIE: podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:982
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:989
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "To�samo�� u�ytkownika nie zosta�a w og�le sprawdzona.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1001
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "To�samo�� u�ytkownika zosta�a sprawdzona pobie�nie.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1006
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "To�samo�� u�ytkownika zosta�a dok�adnie sprawdzona.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1016
 msgid "Really sign? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
-#: g10/keyedit.c:5004 g10/sign.c:352
+#: g10/keyedit.c:1061 g10/keyedit.c:4793 g10/keyedit.c:4884 g10/keyedit.c:4948
+#: g10/keyedit.c:5009 g10/sign.c:351
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1126
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1137 g10/keygen.c:3215
 msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1145 g10/keygen.c:3218
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1149 g10/keygen.c:3222
 msgid "Key is protected.\n"
 msgstr "Klucz jest chroniony.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1173
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tego klucza nie mo�na edytowa�: %s.\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1179
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3075,11 +3080,11 @@ msgstr ""
 "Wprowad� nowe d�ugie, skomplikowane has�o dla tego klucza tajnego.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1188 g10/keygen.c:1895
 msgid "passphrase not correctly repeated; try again"
 msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1193
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3087,209 +3092,209 @@ msgstr ""
 "Nie chcesz has�a - to *z�y* pomys�!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1196
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Czy na pewno chcesz to zrobi�? "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1267
 msgid "moving a key signature to the correct place\n"
 msgstr "przenosz� podpis klucza na w�a�ciwe miejsce\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1353
 msgid "save and quit"
 msgstr "zapis zmian i wyj�cie"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1356
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1357
 msgid "list key and user IDs"
 msgstr "lista kluczy i identyfikator�w u�ytkownik�w"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1359
 msgid "select user ID N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1360
 #, fuzzy
 msgid "select subkey N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1361
 #, fuzzy
 msgid "check signatures"
 msgstr "uniewa�nienie podpisu"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1366
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "z�o�enie prywatnego (lokalnego) podpisu na kluczu"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "lid %lu: niepodpisany identyfikator u�ytkownika\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1379
 msgid "add a user ID"
 msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1381
 msgid "add a photo ID"
 msgstr "dodanie zdj�cia u�ytkownika do klucza"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1383
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "usuni�cie identyfikatora u�ytkownika z klucza"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1388
 #, fuzzy
 msgid "add a subkey"
 msgstr "dodkl"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1392
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1394
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1396
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "usuni�cie podklucza"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1402
 msgid "add a revocation key"
 msgstr "wyznaczenie klucza uniewa�niaj�cego"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nie mo�na zmieni� daty wa�no�ci klucza w wersji 3.\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "oznaczenie identyfikatora u�ytkownika jako g��wnego"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "prze��czenie pomi�dzy list� kluczy publicznych i prywatnych"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1413
 msgid "list preferences (expert)"
 msgstr "ustawienia (zaawansowane)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1415
 msgid "list preferences (verbose)"
 msgstr "rozbudowana lista ustawie�"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "zmiana has�a klucza"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Czy na pewno uniewa�ni� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "uniewa�nienie identyfikatora u�ytkownika"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "uniewa�nienie podklucza"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "w��czy� klucz do u�ycia"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "wy��czy� klucz z u�ycia"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "okazanie identyfikatora - zdj�cia"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1446
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1564
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "b��d odczytu bloku klucza tajnego '%s': %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1582
 msgid "Secret key is available.\n"
 msgstr "Dost�pny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1663
 msgid "Need the secret key to do this.\n"
 msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1671
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Najpierw trzeba u�y� polecenia \"prze�\".\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1690
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3297,242 +3302,242 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1730
 msgid "Key is revoked."
 msgstr "Klucz uniewa�niony."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1749
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Podpisa� wszystkie identyfikatory u�ytkownika na tym kluczu? "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1756
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1765
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nieznana klasa podpisu"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1788
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "To polecenie nie jest dost�pne w trybie %s.\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
 msgid "You must select at least one user ID.\n"
 msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1812
 msgid "You can't delete the last user ID!\n"
 msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1814
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1815
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1865
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1877
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1905
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1960
 msgid "You must select at least one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1963
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Czy na pewno chcesz usun�� wybrane klucze? "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1964
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Czy na pewno chcesz usun�� ten klucz? "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:1999
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Czy na pewno uniewa�ni� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2000
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Czy na pewno uniewa�ni� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2018
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2029
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� wybrane klucze? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2081
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2123
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "ustawienie opcji klucza"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Czy na pewno usaktualni� ustawienia? "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2199
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Zapisa� zmiany? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2202
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Wyj�� bez zapisania zmian? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2212
 #, c-format
 msgid "update failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "zapis zmian na kluczu prywatnym nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2226
 msgid "Key not changed so no update needed.\n"
 msgstr "Klucz nie zosta� zmieniony wi�c zapis zmian nie jest konieczny.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2327
 msgid "Digest: "
 msgstr "Skr�t: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2379
 msgid "Features: "
 msgstr "Ustawienia: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2390
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2405 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2413 g10/keyedit.c:2414
 #, fuzzy
 msgid "Notations: "
 msgstr "Adnotacja: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2624
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Klucze PGP 2.x nie zawieraj� opisu ustawie�.\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2683
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Klucz mo�e zosta� uniewa�niony przez klucz %s "
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2704
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Klucz mo�e zosta� uniewa�niony przez klucz %s "
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2710
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (poufne)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keyedit.c:2726 g10/keyedit.c:2782 g10/keyedit.c:2843 g10/keyedit.c:2858
 #: g10/keylist.c:194 g10/keyserver.c:511
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2729 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[uniewa�niony]"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2731 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [wygasa :%s]"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2733 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [wygasa :%s]"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2735
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2754
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2761
 msgid "This key has been disabled"
 msgstr "Ten klucz zosta� wy��czony z u�ytku"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2789 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2813
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3540,19 +3545,19 @@ msgstr ""
 "Pokazana warto�� wiarygodno�ci klucza mo�e by� niepoprawna,\n"
 "dop�ki program nie zostanie uruchomiony ponownie.\n"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[uniewa�niony]"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "data"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2944
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3561,7 +3566,7 @@ msgstr ""
 "             jako g��wny. Wykonanie tego polecenie mo�e wi�c spowodowa�\n"
 "             wy�wietlanie innego identyfikatora jako domy�lnego g��wnego.\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3005
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3570,74 +3575,74 @@ msgstr ""
 "OSTRZE�ENIE: To jest klucz PGP wersji 2. Dodanie zdj�cia spowoduje, �e\n"
 "             niekt�re wersje przestan� go rozumie�.\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3351
+#: g10/keyedit.c:3010 g10/keyedit.c:3345
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Czy dalej chcesz je doda�? (t/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3016
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Do klucza dla PGP 2.x nie mo�na doda� zdj�cia.\n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3156
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun�� ten poprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3166
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun�� ten niepoprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3170
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun�� ten nieznany podpis? (t/N/w) "
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3176
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N) "
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3190
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuni�ty.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3191
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpis�w usuni�tych.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3194
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta�o usuni�te.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3227 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "niepoprawny"
 
-#: g10/keyedit.c:3235
+#: g10/keyedit.c:3229
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
 
-#: g10/keyedit.c:3242
+#: g10/keyedit.c:3236
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3237
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3246
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3340
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3647,372 +3652,372 @@ msgstr ""
 "             uniewa�niaj�cego, spowoduje, �e niekt�re wersje PGP przestan�\n"
 "             go rozumie�.\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3351
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Do klucza dla PGP 2.x nie mo�na wyznaczy� klucza uniewa�niaj�cego.\n"
 
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3371
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Podaj identyfikator klucza uniewa�niaj�cego: "
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3396
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "klucza PGP 2.x nie mo�na wyznaczy� jako uniewa�niaj�cego\n"
 
-#: g10/keyedit.c:3417
+#: g10/keyedit.c:3411
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "nie mo�na wyznaczu� klucza do uniewa�niania jego samego\n"
 
-#: g10/keyedit.c:3439
+#: g10/keyedit.c:3433
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony kluczem uniewa�niaj�cym!\n"
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3452
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "OSTRZE�ENIE: nie mo�na cofn�� wyznaczenia klucza jako uniewa�niaj�cego!\n"
 
-#: g10/keyedit.c:3464
+#: g10/keyedit.c:3458
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Czy na pewno chcesz wyznaczy� ten klucz jako uniewa�niaj�cy? (t/N): "
 
-#: g10/keyedit.c:3525
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Prosz� usun�� znacznik wyboru z kluczy prywatnych.\n"
 
-#: g10/keyedit.c:3531
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Prosz� wybra� tylko jeden podklucz.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Zmiana daty wa�no�ci podklucza.\n"
 
-#: g10/keyedit.c:3538
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3582
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nie mo�na zmieni� daty wa�no�ci klucza w wersji 3.\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3598
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3678
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "OSTRZE�ENIE: podklucz podpisuj�cy %08lX nie jest skro�nie podpisany\n"
 
-#: g10/keyedit.c:3679
+#: g10/keyedit.c:3684
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3841
+#: g10/keyedit.c:3846
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosz� wybra� dok�adnie jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
+#: g10/keyedit.c:3885 g10/keyedit.c:3995 g10/keyedit.c:4115 g10/keyedit.c:4256
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "podpis w wersji 3 na identyfikatorze ,,%s'' zostaje pomini�ty\n"
 
-#: g10/keyedit.c:4051
+#: g10/keyedit.c:4056
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4131
+#: g10/keyedit.c:4136
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Czy na pewno chcesz tego u�y�? (t/N) "
 
-#: g10/keyedit.c:4132
+#: g10/keyedit.c:4137
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Czy na pewno chcesz tego u�y�? (t/N) "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4199
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Adnotacje podpisu: "
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4348
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Nadpisa� (t/N)? "
 
-#: g10/keyedit.c:4407
+#: g10/keyedit.c:4412
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4470
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4492
+#: g10/keyedit.c:4497
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4627
+#: g10/keyedit.c:4632
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Identyfikator u�ytkownika: "
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4635 g10/keyedit.c:4699 g10/keyedit.c:4742
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "podpisany przez %08lX w %s%s%s\n"
 
-#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 msgid " (non-exportable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4641
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Wa�no�� tego klucza wygas�a %s.\n"
 
-#: g10/keyedit.c:4640
+#: g10/keyedit.c:4645
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz go uniewa�ni�? (t/N) "
 
-#: g10/keyedit.c:4644
+#: g10/keyedit.c:4649
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego podpisu? (t/N) "
 
-#: g10/keyedit.c:4671
+#: g10/keyedit.c:4676
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Te identyfikatory s� podpisane przez Ciebie:\n"
 
-#: g10/keyedit.c:4697
+#: g10/keyedit.c:4702
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4709
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "uniewa�niony przez %08lX w %s\n"
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4731
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
 
-#: g10/keyedit.c:4746
+#: g10/keyedit.c:4751
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N) "
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4781
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
-#: g10/keyedit.c:4846
+#: g10/keyedit.c:4851
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:4863
+#: g10/keyedit.c:4868
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "OSTRZE�ENIE: identyfikator u�ytkownika podpisany za %d sekund (w "
 "przysz�o�ci)\n"
 
-#: g10/keyedit.c:4927
+#: g10/keyedit.c:4932
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:4989
+#: g10/keyedit.c:4994
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:5084
+#: g10/keyedit.c:5089
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Zdj�cie w formacie %s, rozmiar %ld bajt�w, klucz 0x%08lX (id %d).\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "ustawienie %c%lu powtarza si�\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "zbyt wiele `%c' ustawie�\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "zbyt wiele `%c' ustawie�\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "zbyt wiele `%c' ustawie�\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "niew�a�ciwy znak w tek�cie ustawie�\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:876
 msgid "writing direct signature\n"
 msgstr "zapis podpisu bezpo�redniego\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:915
 msgid "writing self signature\n"
 msgstr "zapis podpisu klucza nim samym\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:965
 msgid "writing key binding signature\n"
 msgstr "zapis podpisu wi���cego klucz\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
+#: g10/keygen.c:2776
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "niew�a�ciwa d�ugo�� klucza; wykorzystano %u bit�w\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rozmair klucza zaokr�glony do %u bit�w\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1331
 #, fuzzy
 msgid "Sign"
 msgstr "podpis"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1334
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1337
 #, fuzzy
 msgid "Encrypt"
 msgstr "szyfrowanie danych"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1340
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1348
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1367
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1371
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1376
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1379
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1382
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1385
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1441
 msgid "Please select what kind of key you want:\n"
 msgstr "Prosz� wybra� rodzaj klucza:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1443
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) Para kluczy dla algorytm�w DSA i ElGamala (domy�lne)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1453
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1522
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Para kluczy dla DSA b�dzie mia�a 1024 bity d�ugo�ci.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1532
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1539
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Jakiej d�ugo�ci klucz wygenerowa�? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1553
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1559
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "��dana d�ugo�� klucza to %u bit�w.\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1564 g10/keygen.c:1569
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�glono do %u bit�w\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1618
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4028,7 +4033,7 @@ msgstr ""
 "      <n>m = termin wa�no�ci klucza up�ywa za n miesi�cy\n"
 "      <n>y = termin wa�no�ci klucza up�ywa za n lat\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1629
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4044,40 +4049,40 @@ msgstr ""
 "      <n>m = termin wa�no�ci podpisu up�ywa za n miesi�cy\n"
 "      <n>y = termin wa�no�ci podpisu up�ywa za n lat\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Key is valid for? (0) "
 msgstr "Okres wa�no�ci klucza ? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Okres wa�no�ci podpisu? (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1673
 msgid "invalid value\n"
 msgstr "niepoprawna warto��\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1680
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s nie ma daty wa�no�ci\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s nie ma daty wa�no�ci\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1686
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s traci wa�no��: %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1687
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Wa�no�� podpisu wygasa %s.\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1693
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4085,12 +4090,12 @@ msgstr ""
 "Tw�j system nie potrafi pokaza� daty po roku 2038.\n"
 "Niemniej daty do roku 2106 b�d� poprawnie obs�ugiwane.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1698
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Czy wszystko si� zgadza (t/n)? "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1713
 #, fuzzy
 msgid ""
 "\n"
@@ -4107,44 +4112,44 @@ msgstr ""
 "    \"Tadeusz �ele�ski (Boy) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1726
 msgid "Real name: "
 msgstr "Imi� i nazwisko: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Invalid character in name\n"
 msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name may not start with a digit\n"
 msgstr "Imi� lub nazwisko nie mo�e zaczyna� si� od cyfry\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1738
 msgid "Name must be at least 5 characters long\n"
 msgstr "Imi� i nazwisko musz� mie� conajmniej 5 znak�w d�ugo�ci.\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1746
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1752
 msgid "Not a valid email address\n"
 msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1760
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1766
 msgid "Invalid character in comment\n"
 msgstr "Niew�a�ciwy znak w komentarzu\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1789
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "U�ywasz zestawu znak�w %s.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1795
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4155,7 +4160,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1800
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Nie nalezy umieszcza� adresu poczty elektronicznej w polu nazwiska czy\n"
@@ -4172,37 +4177,37 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1826
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, czy (W)yj��? "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, przej�� (D)alej,\n"
 "czy (W)yj�� z programu ? "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:1846
 msgid "Please correct the error first\n"
 msgstr "Najpierw trzeba poprawi� ten b��d\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1886
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 "Musisz poda� d�ugie, skomplikowane has�o aby ochroni� sw�j klucz tajny.\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:1896 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1902
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4214,7 +4219,7 @@ msgstr ""
 "\"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:1924
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4230,50 +4235,50 @@ msgstr ""
 "ilo�ci\n"
 "entropii.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2722
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza zosta�a anulowana.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:2921 g10/keygen.c:3068
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuj� klucz publiczny w '%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:2923 g10/keygen.c:3071
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:2926 g10/keygen.c:3074
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3057
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3063
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy tajnych: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3081
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3088
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3111
 msgid "public and secret key created and signed.\n"
 msgstr "klucz publiczny i prywatny (tajny) zosta�y utworzone i podpisane.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3122
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4282,12 +4287,12 @@ msgstr ""
 "Ten klucz nie mo�e by� wykorzystany do szyfrowania. Komend� \"--edit-key\"\n"
 "mo�na doda� do niego podklucz szyfruj�cy.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4295,7 +4300,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4303,27 +4308,27 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3197 g10/keygen.c:3326
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "UWAGA: tworzenie podkluczy dla kluczy wersji 3 jest niezgodne z OpenPGP.\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3236 g10/keygen.c:3359
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Czy na pewno utworzy�? "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3524
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3571
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3597
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "UWAGA: wa�no�� klucza tajnego %08lX wygas�a %s\n"
@@ -4608,209 +4613,213 @@ msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:239
 #, 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:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "klucz sesyjny zaszyfrowany %s\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:300
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:381
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "klucz publiczny %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:438
 msgid "public key encrypted data: good DEK\n"
 msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:471
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:475 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                        alias \""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:479
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "zaszyfrowano kluczem %s, o numerze %08lX\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:493
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "b��d odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:507
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "zaszyfrowane za pomoc� %lu hase�\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:509
 msgid "encrypted with 1 passphrase\n"
 msgstr "zaszyfrowane jednym has�em\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:540 g10/mainproc.c:562
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "przyjmuj�c �e dane zosta�y zaszyfrowane za pomoc� %s\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:548
 #, 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:581
+#: g10/mainproc.c:580
 msgid "decryption okay\n"
 msgstr "odszyfrowanie poprawne\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:584
 msgid "WARNING: message was not integrity protected\n"
 msgstr "OSTRZE�ENIE: wiadomo�� nie by�a zabezpieczona przed manipulacj�\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:597
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "OSTRZE�ENIE: zaszyfrowana wiadomo�� by�a manipulowana!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:603
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:624
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "UWAGA: nadawca zaznaczy� �e wiadomo�� nie powinna by� zapisywana\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:626
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:711
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr ""
+
+#: g10/mainproc.c:839
 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:1165
+#: g10/mainproc.c:1187
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1430
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1539
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "nie mo�na obs�uzy� tych wielokrotnych podpis�w\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1550
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1555
 #, 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:1544
+#: g10/mainproc.c:1575
 msgid "Key available at: "
 msgstr "Klucz dost�pny w: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "NIEPOPRAWNY podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Przeterminowany podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr "[niepewne]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1797
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1895
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1900
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Wa�no�� podpisu wygasa %s.\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1903
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr "binarny"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr "tekstowy"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 msgid "unknown"
 msgstr "nieznany"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mo�na sprawdzi� podpisu: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
 msgstr "nie jest oddzielonym podpisem.\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:2037
 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:2013
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "oddzielony podpis klasy 0x%02x.\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x).\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
@@ -4945,18 +4954,18 @@ msgstr "OSTRZE�ENIE: opcje w ,,%s'' nie s� jeszcze uwzgl�dnione.\n"
 msgid "directory `%s' created\n"
 msgstr "%s: katalog utworzony\n"
 
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:143
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nie mo�na obs�u�y� tego algorytmu klucza publicznego: %d\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:713
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "OSTRZE�ENIE: symetrycznie zaszyfrowany klucz sesyjny mo�e nie by� "
 "bezpieczny\n"
 
-#: g10/parse-packet.c:1159
+#: g10/parse-packet.c:1164
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
@@ -5721,12 +5730,12 @@ msgstr ""
 "OSTRZE�ENIE: nie mo�na rozwin�� znacznik�w %% w URL regulaminu\n"
 "           (jest zbyt d�ugi). U�yty zostanie nie rozwini�ty.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:346
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:355
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s podpis z�o�ony przez: ,,%s''\n"
@@ -5747,11 +5756,11 @@ msgstr "wymuszone u�ycie skr�tu %s (%d) k��ci si� z ustawieniami adresata\n"
 msgid "signing:"
 msgstr "podpis:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1101
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "w trybie --pgp2 mo�na podpisywa� tylko za pomoc� kluczy z wersji 2.x\n"
 
-#: g10/sign.c:1278
+#: g10/sign.c:1280
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "zostanie u�yty szyfr %s\n"
diff --git a/po/pt.po b/po/pt.po
index 528bebc7c..0e4a000e8 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-12-04 15:05+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt <[email protected]>\n"
@@ -43,10 +43,10 @@ msgstr "a escrever chave privada para `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
+#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -80,9 +80,9 @@ msgstr "imposs�vel ler `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "nota: ficheiro random_seed n�o actualizado\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
+#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
+#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
@@ -394,15 +394,15 @@ msgstr "chave secreta n�o dispon�vel"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
+#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
+#: g10/keygen.c:1456
 msgid "Your selection? "
 msgstr "Op��o? "
 
@@ -580,8 +580,8 @@ msgstr "   (%d) RSA (apenas cifragem)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
+#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
@@ -605,7 +605,7 @@ msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1319 g10/keyedit.c:1351
 msgid "quit this menu"
 msgstr "sair deste menu"
 
@@ -614,7 +614,7 @@ msgstr "sair deste menu"
 msgid "show admin commands"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1322 g10/keyedit.c:1354
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
@@ -671,7 +671,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1457 g10/keyedit.c:1617
 msgid "Command> "
 msgstr "Comando> "
 
@@ -690,7 +690,7 @@ msgstr "comandos em conflito\n"
 msgid "Admin commands are not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1602 g10/keyedit.c:2238
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
@@ -745,7 +745,7 @@ msgstr "Repita a frase secreta: "
 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:3868 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 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,7 +755,7 @@ msgstr "imposs�vel abrir `%s'\n"
 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:3392 g10/keyserver.c:1705
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3386 g10/keyserver.c:1705
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -804,7 +804,7 @@ msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utilize a op��o \"--delete-secret-keys\" para a apagar primeiro.\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:213 g10/sign.c:1286
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
@@ -876,12 +876,12 @@ msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:292
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dados cifrados com %s\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:296
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
@@ -1021,7 +1021,7 @@ msgstr ""
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:379
 msgid ""
 "@Commands:\n"
 " "
@@ -1029,128 +1029,128 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:380
+#: g10/gpg.c:381
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:383
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "encrypt data"
 msgstr "cifrar dados"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar apenas com cifra sim�trica"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "decrypt data (default)"
 msgstr "decifrar dados (ac��o por omiss�o)"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:394
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "remove keys from the public keyring"
 msgstr "remover chaves do porta-chaves p�blico"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "remove keys from the secret keyring"
 msgstr "remover chaves do porta-chaves secreto"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:404
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:408
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor de chaves"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:409
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor de chaves"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "search for keys on a key server"
 msgstr "procurar chaves num servidor de chaves"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:413
 msgid "update all keys from a keyserver"
 msgstr "actualizar todas as chaves a partir de um servidor de chaves"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:417
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:419
+#: g10/gpg.c:420
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:421
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:422
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confian�a"
 
-#: g10/gpg.c:437
+#: g10/gpg.c:438
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:441 g10/gpgv.c:71
+#: g10/gpg.c:442 g10/gpgv.c:70
 msgid ""
 "@\n"
 "Options:\n"
@@ -1160,55 +1160,55 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:445
+#: g10/gpg.c:446
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou decifrar"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:458
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desactiva)"
 
-#: g10/gpg.c:462
+#: g10/gpg.c:463
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:477
 msgid "use as output file"
 msgstr "usar como ficheiro de sa�da"
 
-#: g10/gpg.c:478 g10/gpgv.c:73
+#: g10/gpg.c:479 g10/gpgv.c:72
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:491
 msgid "prompt before overwriting"
 msgstr "perguntar antes de sobrep�r"
 
-#: g10/gpg.c:531
+#: g10/gpg.c:532
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:532
+#: g10/gpg.c:533
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1216,7 +1216,7 @@ msgstr ""
 "@\n"
 "(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
 
-#: g10/gpg.c:564
+#: g10/gpg.c:565
 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:763 g10/gpgv.c:98
+#: g10/gpg.c:766 g10/gpgv.c:97
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:783
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1254,7 +1254,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:794
+#: g10/gpg.c:797
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1262,580 +1262,585 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid "Pubkey: "
 msgstr "Chave p�blica: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2310
+#: g10/gpg.c:806 g10/keyedit.c:2304
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:809
+#: g10/gpg.c:812
 msgid "Hash: "
 msgstr "Dispers�o: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2356
+#: g10/gpg.c:818 g10/keyedit.c:2350
 msgid "Compression: "
 msgstr "Compress�o: "
 
-#: g10/gpg.c:898
+#: g10/gpg.c:901
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1046
+#: g10/gpg.c:1049
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1067
 #, 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:1261
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, 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:1279
+#: g10/gpg.c:1282
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1288
 #, 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:1288
+#: g10/gpg.c:1291
 #, 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:1291
+#: g10/gpg.c:1294
 #, 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:1297
+#: g10/gpg.c:1300
 #, 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:1300
+#: g10/gpg.c:1303
 #, 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:1303
+#: g10/gpg.c:1306
 #, 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:1444
+#: g10/gpg.c:1447
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostrar em que porta-chave a chave est�"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1954
+#: g10/gpg.c:1957
 #, 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:1996
+#: g10/gpg.c:1999
 #, 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:2000
+#: g10/gpg.c:2003
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: g10/gpg.c:2007
+#: g10/gpg.c:2010
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2236
+#: g10/gpg.c:2239
 #, 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:2402 g10/gpg.c:2414
+#: g10/gpg.c:2405 g10/gpg.c:2417
 #, 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:2491
+#: g10/gpg.c:2494
 #, 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:2515 g10/gpg.c:2702 g10/keyedit.c:4069
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "%s n�o � um conjunto de caracteres v�lido\n"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2610
 #, 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:2768
+#: g10/gpg.c:2773
 #, 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:2771
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrep�e %s\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:2858
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2875
 #, 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:2880
+#: g10/gpg.c:2890
 #, 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:2894
+#: g10/gpg.c:2904
 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:2900
+#: g10/gpg.c:2910
 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:2906
+#: g10/gpg.c:2916
 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:2919
+#: g10/gpg.c:2929
 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:2986 g10/gpg.c:3010
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:2992 g10/gpg.c:3016
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
-#: g10/gpg.c:2998
+#: g10/gpg.c:3008
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:3004
+#: g10/gpg.c:3014
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3029
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3031
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3033
 #, 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:3025
+#: g10/gpg.c:3035
 #, 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:3027
+#: g10/gpg.c:3037
 #, 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:3030
+#: g10/gpg.c:3040
 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:3034
+#: g10/gpg.c:3044
 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:3041
+#: g10/gpg.c:3051
 msgid "invalid default preferences\n"
 msgstr "prefer�ncias por omiss�o inv�lidas\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3060
 msgid "invalid personal cipher preferences\n"
 msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3064
 msgid "invalid personal digest preferences\n"
 msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
 
-#: g10/gpg.c:3058
+#: g10/gpg.c:3068
 msgid "invalid personal compress preferences\n"
 msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
 
-#: g10/gpg.c:3091
+#: g10/gpg.c:3101
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3148
 #, 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:3143
+#: g10/gpg.c:3153
 #, 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:3148
+#: g10/gpg.c:3158
 #, 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:3250
+#: g10/gpg.c:3260
 #, 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:3261
+#: g10/gpg.c:3271
 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:3272
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3291
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3314
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3306
+#: g10/gpg.c:3316
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3319
 #, 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:3327
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3365
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3367
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3370
 #, 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:3380
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/gpg.c:3426
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/gpg.c:3560
+#: g10/gpg.c:3570
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3572
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3564
+#: g10/gpg.c:3574
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3585
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3595
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3644
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/gpg.c:3854
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/gpg.c:3858
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4172
 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:4164
+#: g10/gpg.c:4174
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4207
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
@@ -1860,47 +1865,47 @@ msgstr ""
 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:2380 g10/keyedit.c:3712
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, 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:2611
+#: g10/getkey.c:2614
 #, 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:2658
+#: g10/getkey.c:2661
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:73
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "Remover esta chave do porta-chaves?"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:76
 #, fuzzy
 msgid "make timestamp conflicts only a warning"
 msgstr "conflito de \"timestamp\""
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:77
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DF|escrever informa��es de estado para o\n"
 "descritor de ficheiro DF"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:101
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:104
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2425,7 +2430,7 @@ msgstr "chave %08lX: chave nova - ignorada\n"
 msgid "no writable keyring found: %s\n"
 msgstr "n�o foi encontrada nenhum porta-chaves onde escrever: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
@@ -2785,42 +2790,42 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
+#: g10/keyedit.c:890 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
+#: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  N�o foi poss�vel assinar.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "AVISO: o ID do utilizador \"%s\" n�o � auto-assinado.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "AVISO: o ID do utilizador \"%s\" n�o � auto-assinado.\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2829,11 +2834,11 @@ msgstr ""
 "A sua auto-assinatura em \"%s\"\n"
 "� uma assinatura do tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Quer promov�-la a uma auto-assinatura OpenPGP? (s/N) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2842,12 +2847,12 @@ msgstr ""
 "A sua assinatura actual em \"%s\"\n"
 "� uma assinatura local.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 #, fuzzy
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2856,55 +2861,55 @@ msgstr ""
 "A sua assinatura actual em \"%s\"\n"
 "� uma assinatura local.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Quer promov�-la a uma assinatura export�vel? (s/N)"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" j� foi assinado localmente pela chave %08lX\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" j� foi assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Esta chave expirou!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave vai expirar em %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:883
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "N�o pode criar uma assinatura OpenPGP numa chave PGP 2.x no modo --pgp2.\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:885
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Isto tornaria a chave inutiliz�vel no PGP 2.x.\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:910
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2914,31 +2919,31 @@ msgstr ""
 "pertence\n"
 "� pessoa correcta? Se n�o sabe o que responder, escolha \"0\".\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) N�o vou responder.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) N�o verifiquei.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Verifiquei por alto.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Verifiquei com bastante cuidado.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:927
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:951
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2947,100 +2952,100 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "a sua chave: \""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:958
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Isto ser� uma auto-assinatura.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "AVISO: a assinatura n�o ser� marcada como n�o-export�vel.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:972
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "AVISO: a assinatura n�o ser� marcada como n�o-revoc�vel.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:982
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "A assinatura ser� marcada como n�o-export�vel.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:989
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "A assinatura ser� marcada como n�o-revoc�vel.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "N�o verifiquei esta chave.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1001
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Verifiquei por alto esta chave.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1006
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Verifiquei esta chave com muito cuidado.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1016
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
-#: g10/keyedit.c:5004 g10/sign.c:352
+#: g10/keyedit.c:1061 g10/keyedit.c:4793 g10/keyedit.c:4884 g10/keyedit.c:4948
+#: g10/keyedit.c:5009 g10/sign.c:351
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1126
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1137 g10/keygen.c:3215
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1145 g10/keygen.c:3218
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1149 g10/keygen.c:3222
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1173
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1179
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3048,11 +3053,11 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1188 g10/keygen.c:1895
 msgid "passphrase not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1193
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3060,209 +3065,209 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1196
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voc� quer realmente fazer isso? "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1267
 msgid "moving a key signature to the correct place\n"
 msgstr "a mover a assinatura da chave para o local correcto\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1353
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1356
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1357
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de utilizadores"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1359
 msgid "select user ID N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1360
 #, fuzzy
 msgid "select subkey N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1361
 #, fuzzy
 msgid "check signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1366
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1379
 msgid "add a user ID"
 msgstr "adiciona um novo ID de utilizador"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1381
 msgid "add a photo ID"
 msgstr "adiciona um identificador fotogr�fico"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1383
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "remove ID de utilizador"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1388
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1392
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1394
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1396
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1402
 msgid "add a revocation key"
 msgstr "adiciona uma chave de revoca��o"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "seleccionar o identificador do utilizador como prim�rio"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1413
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias (perito)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1415
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias (detalhadamente)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revocar um ID de utilizador"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "activa uma chave"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "desactiva uma chave"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostrar identificador fotogr�fico"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1446
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1564
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erro na leitura do bloco de chave secreto `%s': %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1582
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1663
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1671
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor utilize o comando \"toggle\" primeiro.\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1690
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3270,242 +3275,242 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1730
 msgid "Key is revoked."
 msgstr "A chave est� revogada."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1749
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realmente assinar todos os IDs de utilizador? "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1756
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1765
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe de assinatura desconhecida"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1788
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Este comando n�o � permitido no modo %s.\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
 msgid "You must select at least one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de utilizador.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1812
 msgid "You can't delete the last user ID!\n"
 msgstr "Voc� n�o pode remover o �ltimo ID de utilizador!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1814
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1815
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1865
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1877
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1905
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1960
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1963
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voc� quer realmente remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1964
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voc� quer realmente remover esta chave? "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:1999
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2000
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realmente revocar este ID de utilizador? "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2018
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Voc� quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2029
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voc� quer realmente revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voc� quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2081
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2123
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "configurar lista de prefer�ncias"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente actualizar as prefer�ncias?"
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2199
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gravar altera��es? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2202
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2212
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2226
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2327
 msgid "Digest: "
 msgstr "'Digest': "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2379
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2390
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2405 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2413 g10/keyedit.c:2414
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2624
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "N�o h� prefer�ncias no ID de utilizador tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2683
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Esta chave pode ser revogada pela chave %s "
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2704
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta chave pode ser revogada pela chave %s "
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2710
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sens�vel)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keyedit.c:2726 g10/keyedit.c:2782 g10/keyedit.c:2843 g10/keyedit.c:2858
 #: g10/keylist.c:194 g10/keyserver.c:511
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2729 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2731 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2733 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2735
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2754
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2761
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2789 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2813
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3513,25 +3518,25 @@ 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:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2944
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3005
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3540,76 +3545,76 @@ msgstr ""
 "AVISO: Esta chave � do tipo PGP2. Se adicionar um identificador fotogr�fico\n"
 "       algumas vers�o do PGP podem rejeit�-la.\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3351
+#: g10/keyedit.c:3010 g10/keyedit.c:3345
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tem a certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3016
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "N�o pode adicionar um identificador fotogr�fico a uma chave tipo PGP2.\n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3156
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3166
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3170
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3176
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3190
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3191
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3194
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3227 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
 
-#: g10/keyedit.c:3235
+#: g10/keyedit.c:3229
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:3242
+#: g10/keyedit.c:3236
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3237
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3246
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3340
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3618,372 +3623,372 @@ msgstr ""
 "AVISO: Esta chave � do tipo PGP 2.x. Se adicionar um revogador designado\n"
 "       algumas vers�o do PGP podem rejeit�-la.\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3351
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "N�o pode adicionar um revogador designado a uma chave tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3371
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Insira o ID de utilizador do revogador escolhido: "
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3396
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
 
-#: g10/keyedit.c:3417
+#: g10/keyedit.c:3411
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3439
+#: g10/keyedit.c:3433
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3452
 #, fuzzy
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3464
+#: g10/keyedit.c:3458
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3525
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selec��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3531
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "A modificar a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3538
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3582
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3598
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3678
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3679
+#: g10/keyedit.c:3684
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3841
+#: g10/keyedit.c:3846
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\n"
 
-#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
+#: g10/keyedit.c:3885 g10/keyedit.c:3995 g10/keyedit.c:4115 g10/keyedit.c:4256
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "a ignorar auto-assinatura v3 no utilizar com o id \"%s\"\n"
 
-#: g10/keyedit.c:4051
+#: g10/keyedit.c:4056
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4131
+#: g10/keyedit.c:4136
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:4132
+#: g10/keyedit.c:4137
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4199
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Nota��o de assinatura: "
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4348
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Escrever por cima (s/N)? "
 
-#: g10/keyedit.c:4407
+#: g10/keyedit.c:4412
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4470
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4492
+#: g10/keyedit.c:4497
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4627
+#: g10/keyedit.c:4632
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4635 g10/keyedit.c:4699 g10/keyedit.c:4742
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s%s%s\n"
 
-#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 msgid " (non-exportable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4641
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keyedit.c:4640
+#: g10/keyedit.c:4645
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Tem a certeza de que quer revog�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:4644
+#: g10/keyedit.c:4649
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/keyedit.c:4671
+#: g10/keyedit.c:4676
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:4697
+#: g10/keyedit.c:4702
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4709
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4731
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:4746
+#: g10/keyedit.c:4751
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente criar os certificados de revoga��o? (s/N) "
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4781
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:4846
+#: g10/keyedit.c:4851
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:4863
+#: g10/keyedit.c:4868
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVISO: a assintura do ID do utilizador tem data %d segundos no futuro\n"
 
-#: g10/keyedit.c:4927
+#: g10/keyedit.c:4932
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:4989
+#: g10/keyedit.c:4994
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:5084
+#: g10/keyedit.c:5089
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "A mostrar a fotografia %s com o tamanho %ld da chave 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "prefer�ncia %c%lu duplicada\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "demasiadas prefer�ncias `%c'\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "demasiadas prefer�ncias `%c'\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "demasiadas prefer�ncias `%c'\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:876
 msgid "writing direct signature\n"
 msgstr "a escrever a assinatura directa\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:915
 msgid "writing self signature\n"
 msgstr "a escrever a auto-assinatura\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:965
 msgid "writing key binding signature\n"
 msgstr "a escrever a assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
+#: g10/keygen.c:2776
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamanho de chave inv�lido; a utilizar %u bits\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamanho da chave arredondado para %u bits\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1331
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1334
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1337
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifrar dados"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1340
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1348
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1367
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1371
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1376
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1379
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1382
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1385
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1441
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1443
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por omiss�o)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1453
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1522
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1532
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1539
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1553
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1559
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1564 g10/keygen.c:1569
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1618
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3999,7 +4004,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1629
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4015,40 +4020,40 @@ msgstr ""
 "      <n>m = assinatura expira em n meses\n"
 "      <n>y = assinatura expira em n anos\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "A assinatura � valida por? (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1673
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1680
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "A %s n�o expira nunca\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "A %s n�o expira nunca\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1686
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s expira em %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1687
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1693
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4056,12 +4061,12 @@ msgstr ""
 "O seu sistema n�o consegue mostrar datas para al�m de 2038.\n"
 "No entanto, estas v�o ser tratadas correctamente at� 2106.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1698
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1713
 #, fuzzy
 msgid ""
 "\n"
@@ -4079,44 +4084,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1726
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido no nome\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name may not start with a digit\n"
 msgstr "O nome n�o pode come�ar com um d�gito\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1738
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1746
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1752
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1760
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1766
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido no coment�rio\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1789
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1795
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4127,7 +4132,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1800
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor n�o coloque o endere�o de email no nome verdadeiro ou no "
@@ -4144,23 +4149,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1826
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Mudar (N)ome, (C)oment�rio, (E)mail ou (S)air? "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Mudar (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:1846
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primeiro o erro\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1886
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4168,12 +4173,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:1896 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1902
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4185,7 +4190,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:1924
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4197,50 +4202,50 @@ msgstr ""
 "gera��o dos n�meros primos; isso d� ao gerador de n�meros aleat�rios\n"
 "uma hip�tese maior de ganhar entropia suficiente.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2722
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:2921 g10/keygen.c:3068
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:2923 g10/keygen.c:3071
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:2926 g10/keygen.c:3074
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3057
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenhum porta-chaves p�blico com permiss�es de escrita encontrado: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3063
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nenhum porta-chaves secreto com permiss�es de escrita encontrado: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3081
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves p�blico `%s': %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3088
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3111
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3122
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4249,12 +4254,12 @@ msgstr ""
 "Note que esta chave n�o pode ser usada para cifragem. Voc� pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secund�ria para esse fim.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4262,7 +4267,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4270,26 +4275,26 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3197 g10/keygen.c:3326
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: a cria��o de sub-chave para chaves v3 n�o respeito o OpenPGP\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3236 g10/keygen.c:3359
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3524
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3571
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3597
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou em %s\n"
@@ -4574,212 +4579,216 @@ msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:239
 #, 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:291
+#: g10/mainproc.c:290
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "tamanho estranho para uma chave de sess�o cifrada (%d)\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:300
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:381
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:438
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados cifrados com chave p�blica: DEK v�lido\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:471
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:475 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:479
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:493
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifragem de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:507
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:509
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:540 g10/mainproc.c:562
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "a assumir dados cifrados %s\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:548
 #, 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:581
+#: g10/mainproc.c:580
 msgid "decryption okay\n"
 msgstr "decifragem correcta\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:584
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: a mensagem n�o tinha a sua integridade protegida\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:597
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:603
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:624
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:626
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:711
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr ""
+
+#: g10/mainproc.c:839
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca��o solit�ria - utilize \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1187
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1430
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1539
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "n�o consigo tratar estas assinaturas m�ltiplas\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1550
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1555
 #, 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:1544
+#: g10/mainproc.c:1575
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Assinatura expirada de \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1797
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1895
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1900
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1903
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1904
 #, fuzzy
 msgid "binary"
 msgstr "primary"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
 msgstr "n�o � uma assinatura separada\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:2037
 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:2013
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -4917,16 +4926,16 @@ msgstr "AVISO: op��es em `%s' ainda n�o est�o activas nesta execu��o\n"
 msgid "directory `%s' created\n"
 msgstr "%s: directoria criada\n"
 
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:143
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:713
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1159
+#: g10/parse-packet.c:1164
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
@@ -5683,12 +5692,12 @@ msgstr ""
 "AVISO: imposs�vel expandir-%% a url de pol�tica (demasiado grande).\n"
 "A utilizar n�o expandida.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:346
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "verifica��o da assinatura criada falhou: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:355
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "assinatura %s de: \"%s\"\n"
@@ -5709,11 +5718,11 @@ msgstr ""
 msgid "signing:"
 msgstr "a assinar:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1101
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode assinar � vista com chaves do tipo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:1278
+#: g10/sign.c:1280
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "ser� utilizada a cifragem %s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6a605532f..fe37d88d8 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: [email protected]\n"
-"POT-Creation-Date: 2006-12-04 15:05+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -47,10 +47,10 @@ msgstr "escrevendo certificado privado para `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
+#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -84,9 +84,9 @@ msgstr "imposs�vel abrir `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
+#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
+#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
@@ -399,15 +399,15 @@ msgstr "chave secreta n�o dispon�vel"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
+#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
+#: g10/keygen.c:1456
 msgid "Your selection? "
 msgstr "Sua op��o? "
 
@@ -586,8 +586,8 @@ msgstr "   (%d) ElGamal (apenas criptografia)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
+#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
@@ -611,7 +611,7 @@ msgstr "chave secreta n�o dispon�vel"
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1319 g10/keyedit.c:1351
 msgid "quit this menu"
 msgstr "sair deste menu"
 
@@ -620,7 +620,7 @@ msgstr "sair deste menu"
 msgid "show admin commands"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1322 g10/keyedit.c:1354
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
@@ -677,7 +677,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1457 g10/keyedit.c:1617
 msgid "Command> "
 msgstr "Comando> "
 
@@ -697,7 +697,7 @@ msgid "Admin commands are not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
 # help ou ajuda ???
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1602 g10/keyedit.c:2238
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
@@ -755,7 +755,7 @@ msgstr "Repita a frase secreta: "
 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:3868 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -765,7 +765,7 @@ msgstr "imposs�vel abrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3386 g10/keyserver.c:1705
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -815,7 +815,7 @@ msgstr "h� uma chave secreta para esta chave p�blica!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use a op��o \"--delete-secret-key\" para delet�-la antes.\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:213 g10/sign.c:1286
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
@@ -881,12 +881,12 @@ msgstr ""
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s criptografado para: %s\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:292
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:296
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "criptografado com algoritmo desconhecido %d\n"
@@ -1027,7 +1027,7 @@ msgstr ""
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:379
 msgid ""
 "@Commands:\n"
 " "
@@ -1035,134 +1035,134 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:380
+#: g10/gpg.c:381
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:383
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "sim�trica"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padr�o)"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:394
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "remover a chave do chaveiro secreto"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:404
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:408
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:409
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:413
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importar chaves de um servidor"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:417
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:419
+#: g10/gpg.c:420
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:421
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:422
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/gpg.c:437
+#: g10/gpg.c:438
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:441 g10/gpgv.c:71
+#: g10/gpg.c:442 g10/gpgv.c:70
 msgid ""
 "@\n"
 "Options:\n"
@@ -1172,61 +1172,61 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:445
+#: g10/gpg.c:446
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usu�rio para\n"
 "assinar ou descriptografar"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:458
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desabilita)"
 
-#: g10/gpg.c:462
+#: g10/gpg.c:463
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:477
 msgid "use as output file"
 msgstr "usar como arquivo de sa�da"
 
-#: g10/gpg.c:478 g10/gpgv.c:73
+#: g10/gpg.c:479 g10/gpgv.c:72
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:491
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:531
+#: g10/gpg.c:532
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:532
+#: g10/gpg.c:533
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:564
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1246,15 +1246,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/gpg.c:763 g10/gpgv.c:98
+#: g10/gpg.c:766 g10/gpgv.c:97
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:783
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1264,7 +1264,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:794
+#: g10/gpg.c:797
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1272,588 +1272,593 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:803 g10/keyedit.c:2310
+#: g10/gpg.c:806 g10/keyedit.c:2304
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:809
+#: g10/gpg.c:812
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:815 g10/keyedit.c:2356
+#: g10/gpg.c:818 g10/keyedit.c:2350
 #, fuzzy
 msgid "Compression: "
 msgstr "Coment�rio: "
 
-#: g10/gpg.c:898
+#: g10/gpg.c:901
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1046
+#: g10/gpg.c:1049
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1067
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1288
 #, 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:1288
+#: g10/gpg.c:1291
 #, 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:1291
+#: g10/gpg.c:1294
 #, 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:1297
+#: g10/gpg.c:1300
 #, 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:1300
+#: g10/gpg.c:1303
 #, 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:1303
+#: g10/gpg.c:1306
 #, 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:1444
+#: g10/gpg.c:1447
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1954
+#: g10/gpg.c:1957
 #, 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:1996
+#: g10/gpg.c:1999
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/gpg.c:2000
+#: g10/gpg.c:2003
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: g10/gpg.c:2007
+#: g10/gpg.c:2010
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2236
+#: g10/gpg.c:2239
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2402 g10/gpg.c:2414
+#: g10/gpg.c:2405 g10/gpg.c:2417
 #, 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:2491
+#: g10/gpg.c:2494
 #, 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:2515 g10/gpg.c:2702 g10/keyedit.c:4069
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "%s n�o � um conjunto de caracteres v�lido\n"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2768
+#: g10/gpg.c:2773
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2771
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:2858
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2875
 #, 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:2880
+#: g10/gpg.c:2890
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/gpg.c:2894
+#: g10/gpg.c:2904
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2900
+#: g10/gpg.c:2910
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2916
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2919
+#: g10/gpg.c:2929
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:2986 g10/gpg.c:3010
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:2992 g10/gpg.c:3016
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:2998
+#: g10/gpg.c:3008
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3004
+#: g10/gpg.c:3014
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3029
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3031
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3033
 #, 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:3025
+#: g10/gpg.c:3035
 #, 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:3027
+#: g10/gpg.c:3037
 #, 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:3030
+#: g10/gpg.c:3040
 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:3034
+#: g10/gpg.c:3044
 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:3041
+#: g10/gpg.c:3051
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3060
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3064
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3058
+#: g10/gpg.c:3068
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3091
+#: g10/gpg.c:3101
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3148
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3153
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3158
 #, 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:3250
+#: g10/gpg.c:3260
 #, 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:3261
+#: g10/gpg.c:3271
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3291
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3314
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3306
+#: g10/gpg.c:3316
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3319
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3365
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3367
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3370
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3390
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/gpg.c:3426
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
 
-#: g10/gpg.c:3560
+#: g10/gpg.c:3570
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3572
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3564
+#: g10/gpg.c:3574
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3585
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3595
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3644
+#: g10/gpg.c:3654
 #, 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:3731
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/gpg.c:3854
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/gpg.c:3858
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4172
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4174
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4207
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
@@ -1878,47 +1883,47 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2380 g10/keyedit.c:3712
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, 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:2611
+#: g10/getkey.c:2614
 #, 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:2658
+#: g10/getkey.c:2661
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:73
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "Deletar esta chave do chaveiro? "
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:76
 #, fuzzy
 msgid "make timestamp conflicts only a warning"
 msgstr "conflito de \"timestamp\""
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:77
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DA|escrever informa��es de estado para o\n"
 "descritor de arquivo DA"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:101
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:104
 #, fuzzy
 msgid ""
 "Syntax: gpg [options] [files]\n"
@@ -2389,7 +2394,7 @@ msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 msgid "no writable keyring found: %s\n"
 msgstr "imposs�vel escrever chaveiro: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
@@ -2751,151 +2756,151 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
+#: g10/keyedit.c:890 g10/keyedit.c:1736
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
+#: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:824
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:842
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:883
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:885
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:910
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:927
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:951
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2904,90 +2909,90 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "sua chave: \""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:958
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:972
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:982
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:989
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:996
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1001
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1006
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1016
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
-#: g10/keyedit.c:5004 g10/sign.c:352
+#: g10/keyedit.c:1061 g10/keyedit.c:4793 g10/keyedit.c:4884 g10/keyedit.c:4948
+#: g10/keyedit.c:5009 g10/sign.c:351
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1126
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1137 g10/keygen.c:3215
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1145 g10/keygen.c:3218
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1149 g10/keygen.c:3222
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1173
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1179
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2995,12 +3000,12 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1188 g10/keygen.c:1895
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1193
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3008,208 +3013,208 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1196
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voc� realmente quer fazer isso? "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1267
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a assinatura da chave para o local correto\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1353
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1356
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1357
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de usu�rios"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1359
 msgid "select user ID N"
 msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1360
 #, fuzzy
 msgid "select subkey N"
 msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1361
 #, fuzzy
 msgid "check signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1366
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "lid %lu: id de usu�rio sem assinatura\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1379
 msgid "add a user ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1381
 #, fuzzy
 msgid "add a photo ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1383
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "remove ID de usu�rio"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1388
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1392
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1394
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1396
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "add a revocation key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1408
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "ativa uma chave"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "desativa uma chave"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1442
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1446
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1564
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1582
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1663
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1671
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1690
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3217,720 +3222,720 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1730
 #, fuzzy
 msgid "Key is revoked."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1749
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realmente assinar todos os IDs de usu�rio? "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1756
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de usu�rio para assinar\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1765
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe de assinatura desconhecida"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1788
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
 msgid "You must select at least one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1812
 msgid "You can't delete the last user ID!\n"
 msgstr "Voc� n�o pode remover o �ltimo ID de usu�rio!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1814
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1815
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1865
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1877
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1905
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1960
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1963
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voc� realmente quer remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1964
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voc� realmente quer remover esta chave? "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:1999
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2000
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2018
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Voc� realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2029
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voc� realmente quer revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voc� realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2081
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2123
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2199
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvar altera��es? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2202
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem salvar? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2212
 #, c-format
 msgid "update failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2226
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma atualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2327
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2379
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2390
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2405 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2413 g10/keyedit.c:2414
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2624
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2683
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2704
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2710
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keyedit.c:2726 g10/keyedit.c:2782 g10/keyedit.c:2843 g10/keyedit.c:2858
 #: g10/keylist.c:194 g10/keyserver.c:511
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2729 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2731 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2733 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2735
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2754
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2761
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2789 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2813
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2944
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3005
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3351
+#: g10/keyedit.c:3010 g10/keyedit.c:3345
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3016
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3156
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3166
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3170
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3176
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3190
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3191
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3194
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3227 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
 
-#: g10/keyedit.c:3235
+#: g10/keyedit.c:3229
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3242
+#: g10/keyedit.c:3236
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3237
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3246
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3340
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3351
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3371
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Digite o tamanho da chave"
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3396
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3417
+#: g10/keyedit.c:3411
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3439
+#: g10/keyedit.c:3433
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3452
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3464
+#: g10/keyedit.c:3458
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:3525
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as sele��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3531
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Modificando a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3538
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3582
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3598
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3678
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3679
+#: g10/keyedit.c:3684
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3841
+#: g10/keyedit.c:3846
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
+#: g10/keyedit.c:3885 g10/keyedit.c:3995 g10/keyedit.c:4115 g10/keyedit.c:4256
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/keyedit.c:4051
+#: g10/keyedit.c:4056
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4131
+#: g10/keyedit.c:4136
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:4132
+#: g10/keyedit.c:4137
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4199
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4348
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Sobrescrever (s/N)? "
 
-#: g10/keyedit.c:4407
+#: g10/keyedit.c:4412
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4470
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4492
+#: g10/keyedit.c:4497
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4627
+#: g10/keyedit.c:4632
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usu�rio: \""
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4635 g10/keyedit.c:4699 g10/keyedit.c:4742
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4641
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:4640
+#: g10/keyedit.c:4645
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:4644
+#: g10/keyedit.c:4649
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/keyedit.c:4671
+#: g10/keyedit.c:4676
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Voc� assinou estes IDs de usu�rio:\n"
 
-#: g10/keyedit.c:4697
+#: g10/keyedit.c:4702
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "assinar uma chave localmente"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4709
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4731
 msgid "You are about to revoke these signatures:\n"
 msgstr "Voc� est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:4746
+#: g10/keyedit.c:4751
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4781
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:4846
+#: g10/keyedit.c:4851
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:4863
+#: g10/keyedit.c:4868
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4927
+#: g10/keyedit.c:4932
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:4989
+#: g10/keyedit.c:4994
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:5084
+#: g10/keyedit.c:5089
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "ignorado `%s': duplicado\n"
 
 # muitas ou demais ???
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "Prefer�ncias demais"
 
 # muitas ou demais ???
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "Prefer�ncias demais"
 
 # muitas ou demais ???
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "Prefer�ncias demais"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:876
 #, fuzzy
 msgid "writing direct signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:915
 msgid "writing self signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
 # key binding ???
-#: g10/keygen.c:961
+#: g10/keygen.c:965
 msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
+#: g10/keygen.c:2776
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1331
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1334
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1337
 #, fuzzy
 msgid "Encrypt"
 msgstr "criptografar dados"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1340
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1348
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1367
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1371
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1376
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1379
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1382
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1385
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1441
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1443
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (padr�o)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1449
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1451
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1453
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1522
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1532
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1539
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Que tamanho de chave voc� quer? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1553
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1559
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1564 g10/keygen.c:1569
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1618
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3946,7 +3951,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1629
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -3963,40 +3968,40 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1673
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1680
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1686
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1687
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1693
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4004,12 +4009,12 @@ msgstr ""
 "Seu sistema n�o consegue mostrar datas al�m de 2038.\n"
 "Apesar disso, elas ser�o corretamente manipuladas at� 2106.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1698
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1713
 #, fuzzy
 msgid ""
 "\n"
@@ -4026,44 +4031,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1726
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Invalid character in name\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name may not start with a digit\n"
 msgstr "O nome n�o pode come�ar com um d�gito\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1738
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1746
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1752
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1760
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1766
 msgid "Invalid character in comment\n"
 msgstr "Caractere inv�lido no coment�rio\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1789
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1795
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4074,7 +4079,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1800
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -4089,24 +4094,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1826
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muda (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muda (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:1846
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1886
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4114,12 +4119,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:1896 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1902
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4131,7 +4136,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:1924
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4143,50 +4148,50 @@ msgstr ""
 "gera��o dos n�meros primos; isso d� ao gerador de n�meros aleat�rios\n"
 "uma chance melhor de conseguir entropia suficiente.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2722
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:2921 g10/keygen.c:3068
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:2923 g10/keygen.c:3071
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:2926 g10/keygen.c:3074
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3057
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3063
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3081
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3088
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3111
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3122
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4195,12 +4200,12 @@ msgstr ""
 "Note que esta chave n�o pode ser usada para criptografia. Voc� pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secund�ria para esse fim.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4208,7 +4213,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4216,26 +4221,26 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3197 g10/keygen.c:3326
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3236 g10/keygen.c:3359
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3524
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3571
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3597
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou %s\n"
@@ -4528,212 +4533,216 @@ msgstr "%s: novo arquivo de op��es criado\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:239
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:300
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "criptografado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:381
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:438
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados criptografados com chave p�blica: DEK v�lido\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:471
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:475 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:479
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "criptografado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:493
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descriptografia de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:507
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:509
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:540 g10/mainproc.c:562
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:548
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:581
+#: g10/mainproc.c:580
 msgid "decryption okay\n"
 msgstr "descriptografia correta\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:584
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:597
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem criptografada foi manipulada!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:603
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:624
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:626
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome de arquivo original='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:711
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr ""
+
+#: g10/mainproc.c:839
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoga��o isolada - use \"gpg --import\" para aplic�-la\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1187
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1430
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1539
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1550
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1555
 #, 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:1544
+#: g10/mainproc.c:1575
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1797
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1895
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1900
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1903
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:2037
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2013
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura isolada da classe 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -4869,16 +4878,16 @@ msgstr ""
 msgid "directory `%s' created\n"
 msgstr "%s: diret�rio criado\n"
 
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:143
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:713
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1159
+#: g10/parse-packet.c:1164
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
@@ -5629,12 +5638,12 @@ msgid ""
 "unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:347
+#: g10/sign.c:346
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "leitura de registro de assinatura falhou: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:355
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "assinatura %s de: %s\n"
@@ -5653,11 +5662,11 @@ msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 msgid "signing:"
 msgstr "assinando:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1101
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1278
+#: g10/sign.c:1280
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "descriptografia falhou: %s\n"
diff --git a/po/ro.po b/po/ro.po
index ba2e2cce4..5ea871382 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: [email protected]\n"
-"POT-Creation-Date: 2006-12-04 15:05+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2005-05-31 22:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
 "Language-Team: Romanian <[email protected]>\n"
@@ -44,10 +44,10 @@ msgstr "scriu cheia secret� �n `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
+#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -82,9 +82,9 @@ 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:481 g10/gpg.c:1008 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
+#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
+#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nu pot crea `%s': %s\n"
@@ -395,14 +395,14 @@ msgstr "cardul OpenPGP nu e disponibil: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "cardul OpenPGP nr. %s detectat\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
+#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "nu pot face acest lucru �n modul batch\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
+#: g10/keygen.c:1456
 msgid "Your selection? "
 msgstr "Selec�ia d-voastr�? "
 
@@ -568,8 +568,8 @@ msgstr "   (2) Cheie de cifrare\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cheie de autentificare\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
+#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Selec�ie invalid�.\n"
 
@@ -589,7 +589,7 @@ msgstr "p�r�i secrete ale cheii nu sunt disponibile\n"
 msgid "secret key already stored on a card\n"
 msgstr "cheia secret� deja stocat� pe un card\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1319 g10/keyedit.c:1351
 msgid "quit this menu"
 msgstr "ie�i din acest meniu"
 
@@ -597,7 +597,7 @@ msgstr "ie�i din acest meniu"
 msgid "show admin commands"
 msgstr "arat� comenzi administrare"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1322 g10/keyedit.c:1354
 msgid "show this help"
 msgstr "afi�eaz� acest mesaj"
 
@@ -649,7 +649,7 @@ msgstr "meniu pentru a schimba sau debloca PIN-ul"
 msgid "verify the PIN and list all data"
 msgstr "verific� PIN-ul �i listeaz� toate datele"
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1457 g10/keyedit.c:1617
 msgid "Command> "
 msgstr "Comand�> "
 
@@ -665,7 +665,7 @@ msgstr "Sunt permise comenzi administrare\n"
 msgid "Admin commands are not allowed\n"
 msgstr "Nu sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1602 g10/keyedit.c:2238
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
 
@@ -722,7 +722,7 @@ msgstr "Repeta�i acest PIN: "
 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:3868 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -732,7 +732,7 @@ 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:3392 g10/keyserver.c:1705
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3386 g10/keyserver.c:1705
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -780,7 +780,7 @@ msgstr ""
 "folosi�i op�iunea \"--delete-secret-keys\" pentru a o �terge pe aceasta mai "
 "�nt�i.\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:213 g10/sign.c:1286
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
@@ -852,12 +852,12 @@ msgstr "nu pute�i folosi %s c�t� vreme �n modul %s\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrat pentru: \"%s\"\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:292
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s date cifrate\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:296
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrat cu un algoritm necunoscut %d\n"
@@ -997,7 +997,7 @@ msgstr "AVERTISMENT: cheia secret� %s nu are un checksum SK simplu\n"
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTISMENT: nimic exportat\n"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:379
 msgid ""
 "@Commands:\n"
 " "
@@ -1005,127 +1005,127 @@ msgstr ""
 "@Comenzi:\n"
 " "
 
-#: g10/gpg.c:380
+#: g10/gpg.c:381
 msgid "|[file]|make a signature"
 msgstr "|[fi�ier]|creaz� o semn�tur�"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "|[file]|make a clear text signature"
 msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:383
 msgid "make a detached signature"
 msgstr "creaz� o semn�tur� deta�at�"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "encrypt data"
 msgstr "cifreaz� datele"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "encryption only with symmetric cipher"
 msgstr "cifreaz� numai cu cifru simetric"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "decrypt data (default)"
 msgstr "decripteaz� datele (implicit)"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "verify a signature"
 msgstr "verific� o semn�tur�"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "list keys"
 msgstr "enumer� chei"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:394
 msgid "list keys and signatures"
 msgstr "enumer� chei �i semn�turi"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "list and check key signatures"
 msgstr "enumer� �i verific� semn�turile cheii"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "list keys and fingerprints"
 msgstr "enumer� chei �i amprente"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "list secret keys"
 msgstr "enumer� chei secrete"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "generate a new key pair"
 msgstr "genereaz� o nou� perechi de chei"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "remove keys from the public keyring"
 msgstr "�terge chei de pe inelul de chei public"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "remove keys from the secret keyring"
 msgstr "�terge chei de pe inelul de chei secret"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "sign a key"
 msgstr "semneaz� o cheie"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "sign a key locally"
 msgstr "semneaz� o cheie local"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:404
 msgid "sign or edit a key"
 msgstr "semneaz� sau editeaz� o cheie"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "generate a revocation certificate"
 msgstr "genereaz� un certificat de revocare"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "export keys"
 msgstr "export� chei"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:408
 msgid "export keys to a key server"
 msgstr "export� chei pentru un server de chei"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:409
 msgid "import keys from a key server"
 msgstr "import� chei de la un server de chei"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "search for keys on a key server"
 msgstr "caut� pentru chei pe un server de chei"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:413
 msgid "update all keys from a keyserver"
 msgstr "actualizeaz� toate cheile de la un server de chei"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:417
 msgid "import/merge keys"
 msgstr "import�/combin� chei"
 
-#: g10/gpg.c:419
+#: g10/gpg.c:420
 msgid "print the card status"
 msgstr "afi�eaz� starea cardului"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:421
 msgid "change data on a card"
 msgstr "schimb� data de pe card"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:422
 msgid "change a card's PIN"
 msgstr "schimb� PIN-ul unui card"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "update the trust database"
 msgstr "actualizeaz� baza de date de �ncredere"
 
-#: g10/gpg.c:437
+#: g10/gpg.c:438
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
 
-#: g10/gpg.c:441 g10/gpgv.c:71
+#: g10/gpg.c:442 g10/gpgv.c:70
 msgid ""
 "@\n"
 "Options:\n"
@@ -1135,51 +1135,51 @@ msgstr ""
 "Op�iuni:\n"
 " "
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "create ascii armored output"
 msgstr "creaz� ie�ire �n armur� ascii"
 
-#: g10/gpg.c:445
+#: g10/gpg.c:446
 msgid "|NAME|encrypt for NAME"
 msgstr "|NUME|cifrare pentru NUME"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "use this user-id to sign or decrypt"
 msgstr "folose�te acest id-utilizator pentru a semna sau decripta"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:458
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|seteaz� nivel de compresie N (0 deactiveaz�)"
 
-#: g10/gpg.c:462
+#: g10/gpg.c:463
 msgid "use canonical text mode"
 msgstr "folose�te modul text canonic"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:477
 msgid "use as output file"
 msgstr "folose�te ca fi�ier ie�ire"
 
-#: g10/gpg.c:478 g10/gpgv.c:73
+#: g10/gpg.c:479 g10/gpgv.c:72
 msgid "verbose"
 msgstr "locvace"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "do not make any changes"
 msgstr "nu face nici o schimbare"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:491
 msgid "prompt before overwriting"
 msgstr "�ntreab� �nainte de a suprascrie"
 
-#: g10/gpg.c:531
+#: g10/gpg.c:532
 msgid "use strict OpenPGP behavior"
 msgstr "folose�te comportament strict OpenPGP"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:533
 msgid "generate PGP 2.x compatible messages"
 msgstr "genereaz� mesaje compatibile cu PGP 2.x"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1187,7 +1187,7 @@ msgstr ""
 "@\n"
 "(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
 
-#: g10/gpg.c:564
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1207,15 +1207,15 @@ msgstr ""
 " --list-keys [nume]         arat� chei\n"
 " --fingerprint [nume]       arat� amprente\n"
 
-#: g10/gpg.c:763 g10/gpgv.c:98
+#: g10/gpg.c:766 g10/gpgv.c:97
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Raporta�i bug-uri la <[email protected]>.\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:783
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1225,7 +1225,7 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: g10/gpg.c:794
+#: g10/gpg.c:797
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1233,77 +1233,77 @@ msgstr ""
 "\n"
 "Algoritmuri suportate:\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2310
+#: g10/gpg.c:806 g10/keyedit.c:2304
 msgid "Cipher: "
 msgstr "Cifru: "
 
-#: g10/gpg.c:809
+#: g10/gpg.c:812
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2356
+#: g10/gpg.c:818 g10/keyedit.c:2350
 msgid "Compression: "
 msgstr "Compresie: "
 
-#: g10/gpg.c:898
+#: g10/gpg.c:901
 msgid "usage: gpg [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: g10/gpg.c:1046
+#: g10/gpg.c:1049
 msgid "conflicting commands\n"
 msgstr "comenzi �n conflict\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1067
 #, 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:1261
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigur� (unsafe) pentru directorul home `%s'\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, 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:1267
+#: g10/gpg.c:1270
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru extensia `%s'\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1276
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru directorul home `%s'\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, 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:1279
+#: g10/gpg.c:1282
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1288
 #, 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:1288
+#: g10/gpg.c:1291
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1311,21 +1311,21 @@ msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fi�ier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, 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:1297
+#: g10/gpg.c:1300
 #, 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:1300
+#: g10/gpg.c:1303
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1333,492 +1333,497 @@ msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fi�ier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, 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:1444
+#: g10/gpg.c:1447
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 #, 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:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1954
+#: g10/gpg.c:1957
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
 
-#: g10/gpg.c:1996
+#: g10/gpg.c:1999
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOT�: nici un fi�ier op�iuni implicit `%s'\n"
 
-#: g10/gpg.c:2000
+#: g10/gpg.c:2003
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: g10/gpg.c:2007
+#: g10/gpg.c:2010
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "citesc op�iuni din `%s'\n"
 
-#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
 
-#: g10/gpg.c:2236
+#: g10/gpg.c:2239
 #, 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:2402 g10/gpg.c:2414
+#: g10/gpg.c:2405 g10/gpg.c:2417
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2494
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nu este un set de carectere valid\n"
 
 #
-#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 msgid "invalid keyserver options\n"
 msgstr "op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op�iuni import invalide\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "op�iuni import invalide\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op�iuni export invalide\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "op�iuni export invalide\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 msgid "invalid list options\n"
 msgstr "op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "`%s' nu este expirare de semn�tur� valid�\n"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2603
 msgid "invalid verify options\n"
 msgstr "op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execu�ie ca %s\n"
 
-#: g10/gpg.c:2768
+#: g10/gpg.c:2773
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2771
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/gpg.c:2858
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2875
 #, 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:2880
+#: g10/gpg.c:2890
 #, 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:2894
+#: g10/gpg.c:2904
 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:2900
+#: g10/gpg.c:2910
 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:2906
+#: g10/gpg.c:2916
 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:2919
+#: g10/gpg.c:2929
 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:2986 g10/gpg.c:3010
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/gpg.c:2992 g10/gpg.c:3016
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: g10/gpg.c:2998
+#: g10/gpg.c:3008
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm compresie selectat este invalid\n"
 
-#: g10/gpg.c:3004
+#: g10/gpg.c:3014
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3029
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3031
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3033
 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:3025
+#: g10/gpg.c:3035
 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:3027
+#: g10/gpg.c:3037
 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:3030
+#: g10/gpg.c:3040
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3044
 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:3041
+#: g10/gpg.c:3051
 msgid "invalid default preferences\n"
 msgstr "preferin�e implicite invalide\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3060
 msgid "invalid personal cipher preferences\n"
 msgstr "preferin�e cifrare personale invalide\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3064
 msgid "invalid personal digest preferences\n"
 msgstr "preferin�e rezumat personale invalide\n"
 
-#: g10/gpg.c:3058
+#: g10/gpg.c:3068
 msgid "invalid personal compress preferences\n"
 msgstr "preferin�e compresie personale invalide\n"
 
-#: g10/gpg.c:3091
+#: g10/gpg.c:3101
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge �nc� cu %s!\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3148
 #, 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:3143
+#: g10/gpg.c:3153
 #, 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:3148
+#: g10/gpg.c:3158
 #, 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:3250
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3271
 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:3272
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [nume_fi�ier]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3291
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "cifrarea simetric� a lui `%s' a e�uat: %s\n"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3314
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3306
+#: g10/gpg.c:3316
 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:3309
+#: g10/gpg.c:3319
 #, 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:3327
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [nume_fi�ier]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3365
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3367
 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:3360
+#: g10/gpg.c:3370
 #, 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:3380
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nume_fi�ier]"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizator"
 
-#: g10/gpg.c:3426
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizator"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizator [comenzi]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizator] [inel_chei]"
 
-#: g10/gpg.c:3560
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3572
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recep�ie server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3564
+#: g10/gpg.c:3574
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie e�uat: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3585
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "c�utare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3595
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3644
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:3854
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[nume_fi�ier]"
 
-#: g10/gpg.c:3858
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4172
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4174
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4207
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
@@ -1841,42 +1846,42 @@ msgstr ""
 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:2380 g10/keyedit.c:3712
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, 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:2611
+#: g10/getkey.c:2614
 #, 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:2658
+#: g10/getkey.c:2661
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "cheia %s: cheie secret� f�r� cheie public� - s�rit�\n"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:73
 msgid "be somewhat more quiet"
 msgstr "fii oarecum mai t�cut"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "take the keys from this keyring"
 msgstr "ia cheile de pe acest inel de chei"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:76
 msgid "make timestamp conflicts only a warning"
 msgstr "d� numai un avertisment la conflicte de timestamp"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:77
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrie informa�ii de stare �n acest FD"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:101
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Folosire: gpgv [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:104
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2422,7 +2427,7 @@ msgstr "cheia %s: cheie nou� - s�rit�\n"
 msgid "no writable keyring found: %s\n"
 msgstr "n-am g�sit nici un inel de chei ce poate fi scris: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scriu �n `%s'\n"
@@ -2780,41 +2785,41 @@ msgstr ""
 "V� rug�m s� introduce�i domeniul de restric�ionare al acestei semn�turi, sau "
 "ap�sa�i enter pentru niciunul.\n"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
+#: g10/keyedit.c:890 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� �terge�i permanent \"%s\"? (d/N)"
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
+#: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  Nu pot semna.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "ID utilizator \"%s\" este expirat."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID-ul utilizator \"%s\" nu este auto-semnat."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID-ul utilizator \"%s\" poate fi semnat.  "
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 msgid "Sign it? (y/N) "
 msgstr "Dori�i s�-l semna�i? (d/N) "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2823,11 +2828,11 @@ msgstr ""
 "Auto-semn�tura pe \"%s\"\n"
 "este o semn�tur� stil PGP 2.x.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Dori�i s� o promova�i la o auto-semn�tur� OpenPGP? (d/N) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2836,12 +2841,12 @@ msgstr ""
 "Semn�tura d-voastr� curent� pe \"%s\"\n"
 "a expirat.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Dori�i s� crea�i o nou� semn�tur� pentru a o �nlocui pe cea expirat�? (d/N) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2850,43 +2855,43 @@ msgstr ""
 "Semn�tura d-voastr� curent� pe \"%s\"\n"
 "semn�tur� local�.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Dori�i s� o promova�i la o semn�tur� total exportabil�? (d/N) "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" a fost deja semnat� local de cheia %s\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" a fost deja semnat� de cheia %s\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Dori�i s� o semna�i oricum din nou? (d/N) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nimic de semnat cu cheia %s\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Aceast� cheie a expirat!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Aceast� cheie va expira pe %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Dori�i ca semn�tura d-voastr� s� expire �n acela�i timp? (D/n) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:883
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2894,11 +2899,11 @@ msgstr ""
 "Nu pute�i crea o semn�tur� OpenPGP pe o cheie PGP 2.x c�t� vreme sunte�i �n "
 "modul --pgp2.\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:885
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Aceasta va face cheia de nefolosit �n PGP 2.x.\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:910
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2909,31 +2914,31 @@ msgstr ""
 "�ntr-adev�r persoanei numite deasupra?  Dac� nu �ti�i ce s� r�spunde�i,\n"
 "introduce�i \"0\".\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nu voi r�spunde.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Nu am verificat deloc.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Am f�cut ceva verific�ri superficiale.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Am f�cut verific�ri foarte atente.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:927
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Selec�ia dvs.? (introduce�i `?' pentru informa�ii suplimentare): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:951
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2942,76 +2947,76 @@ msgstr ""
 "Sunte�i �ntr-adev�r sigur(�) c� dori�i s� semna�i\n"
 "aceast� cheie cu cheia d-voastr� \"%s\" (%s)\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:958
 msgid "This will be a self-signature.\n"
 msgstr "Aceasta va fi o auto-semn�tur�.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:964
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "AVERTISMENT: semn�tura nu va fi marcat� ca non-exportabil�.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:972
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "AVERTISMENT: semn�tura nu va fi marcat� ca non-revocabil�.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:982
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Semn�tura va fi marcat� ca non-exportabil�.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:989
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Semn�tura va fi marcat� ca non-revocabil�.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:996
 msgid "I have not checked this key at all.\n"
 msgstr "Nu am verificat aceast� cheie deloc.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1001
 msgid "I have checked this key casually.\n"
 msgstr "Am verificat aceast� cheie superficial.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1006
 msgid "I have checked this key very carefully.\n"
 msgstr "Am verificat aceast� cheie foarte atent.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1016
 msgid "Really sign? (y/N) "
 msgstr "Dori�i cu adev�rat s� semna�i? (d/N) "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
-#: g10/keyedit.c:5004 g10/sign.c:352
+#: g10/keyedit.c:1061 g10/keyedit.c:4793 g10/keyedit.c:4884 g10/keyedit.c:4948
+#: g10/keyedit.c:5009 g10/sign.c:351
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "semnarea a e�uat: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1126
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "Cheia are numai articole de cheie sau talon (stub) pe card - nici o fraz� "
 "parol� de schimbat.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1137 g10/keygen.c:3215
 msgid "This key is not protected.\n"
 msgstr "Aceast� cheie nu este protejat�.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "P�r�ile secrete ale cheii primare nu sunt disponibile.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1145 g10/keygen.c:3218
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "P�r�i secrete ale cheii primare sunt stacate pe card.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1149 g10/keygen.c:3222
 msgid "Key is protected.\n"
 msgstr "Cheia este protejat�.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1173
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nu pot edita aceast� cheie: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1179
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3019,11 +3024,11 @@ msgstr ""
 "Introduce�i noua fraz�-parol� pentru acest� cheie secret�.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1188 g10/keygen.c:1895
 msgid "passphrase not correctly repeated; try again"
 msgstr "fraza-parol� nu a fost repetat� corect; mai �ncerca�i o dat�"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1193
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3031,190 +3036,190 @@ msgstr ""
 "Nu dori�i o fraz�-parol� - aceasta este probabil o idee *proast�*!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1196
 msgid "Do you really want to do this? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� face�i acest lucru? (d/N) "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1267
 msgid "moving a key signature to the correct place\n"
 msgstr "mut o semn�tur� de cheie �n locul corect\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1353
 msgid "save and quit"
 msgstr "salveaz� �i termin�"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1356
 msgid "show key fingerprint"
 msgstr "afi�eaz� amprenta cheii"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1357
 msgid "list key and user IDs"
 msgstr "enumer� chei �i ID-uri utilizator"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1359
 msgid "select user ID N"
 msgstr "selecteaz� ID utilizator N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1360
 msgid "select subkey N"
 msgstr "selecteaz� subcheia N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1361
 msgid "check signatures"
 msgstr "verific� semn�turi"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1366
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "semneaz� ID-urile utilizator selectate [* vezi mai jos pentru comenzi "
 "relevante]"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs locally"
 msgstr "semneaz� ID-urile utilizatorilor selecta�i local"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a trust signature"
 msgstr "semneaz� ID-urile utilizatorilor selecta�i cu o semn�tur� de �ncredere"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "semneaz� ID-urile utilizatorilor selecta�i cu o semn�tur� irevocabil�"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1379
 msgid "add a user ID"
 msgstr "adaug� un ID utilizator"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1381
 msgid "add a photo ID"
 msgstr "adaug� o poz� ID"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1383
 msgid "delete selected user IDs"
 msgstr "�terge ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1388
 msgid "add a subkey"
 msgstr "adaug� o subcheie"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1392
 msgid "add a key to a smartcard"
 msgstr "adaug� o cheie la un smartcard"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1394
 msgid "move a key to a smartcard"
 msgstr "mut� o cheie pe un smartcard"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1396
 msgid "move a backup key to a smartcard"
 msgstr "mut� o cheie de rezerv� pe un smartcard"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1400
 msgid "delete selected subkeys"
 msgstr "�terge subcheile selectate"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1402
 msgid "add a revocation key"
 msgstr "adaug� o cheie de revocare"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1404
 msgid "delete signatures from the selected user IDs"
 msgstr "�terge semn�turile de pe ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1406
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "schimb� data de expirare pentru cheia sau subcheile selectate"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1408
 msgid "flag the selected user ID as primary"
 msgstr "marcheaz� ID-ul utilizator selectat ca primar"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1410
 msgid "toggle between the secret and public key listings"
 msgstr "comut� �ntre listele de chei secrete �i publice"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1413
 msgid "list preferences (expert)"
 msgstr "enumer� preferin�ele (expert)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1415
 msgid "list preferences (verbose)"
 msgstr "afi�eaz� preferin�ele (detaliat)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1417
 msgid "set preference list for the selected user IDs"
 msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "seteaz� URL-ul serverului de chei preferat pentru ID-urile utilizator "
 "selectate"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "schimb� �ncrederea pentru proprietar"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1432
 msgid "revoke signatures on the selected user IDs"
 msgstr "revoc� semn�turile pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1434
 msgid "revoke selected user IDs"
 msgstr "revoc� ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1439
 msgid "revoke key or selected subkeys"
 msgstr "revoc� cheia sau subcheile selectate"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1440
 msgid "enable key"
 msgstr "activeaz� cheia"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1441
 msgid "disable key"
 msgstr "deactiveaz� cheia"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1442
 msgid "show selected photo IDs"
 msgstr "arat� pozele pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1446
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1564
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "eroare la citire keyblock secret \"%s\": %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1582
 msgid "Secret key is available.\n"
 msgstr "Cheia secret� este disponibil�.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1663
 msgid "Need the secret key to do this.\n"
 msgstr "Ave�i nevoie de cheia secret� pentru a face aceasta.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1671
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "V� rug�m folosi�i mai �nt�i comanda \"toggle\".\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1690
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3226,228 +3231,228 @@ msgstr ""
 "  pentru semn�turi irevocabile (nrsign), sau orice combina�ie a acestora\n"
 "  (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1730
 msgid "Key is revoked."
 msgstr "Cheia este revocat�."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1749
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Semna�i �ntr-adev�r toate ID-urile utilizator? (d/N) "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1756
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugestie: Selecta�i ID-ul utilizator de semnat\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1765
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Tip de semn�tur� necunoscut `%s'\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1788
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Aceast� comand� nu este permis� �n modul %s.\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
 msgid "You must select at least one user ID.\n"
 msgstr "Trebuie mai �nt�i s� selecta�i cel pu�in un ID utilizator.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1812
 msgid "You can't delete the last user ID!\n"
 msgstr "Nu pute�i �terge ultimul ID utilizator!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1814
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�terge�i �ntr-adev�r toate ID-urile utilizator selectate? (d/N) "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1815
 msgid "Really remove this user ID? (y/N) "
 msgstr "�terge�i �ntr-adev�r acest ID utilizator? (d/N) "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1865
 msgid "Really move the primary key? (y/N) "
 msgstr "Muta�i �ntr-adev�r cheia primar�? (d/N) "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1877
 msgid "You must select exactly one key.\n"
 msgstr "Trebuie s� selecta�i exact o cheie.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1905
 msgid "Command expects a filename argument\n"
 msgstr "Comanda a�teapt� un nume de fi�ier ca argument\n"
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1919
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Nu pot deschide `%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1936
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Eroare citind cheia de rezerv� de pe `%s': %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1960
 msgid "You must select at least one key.\n"
 msgstr "Trebuie s� selecta�i cel pu�in o cheie.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1963
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� �terge�i cheile selectate? (d/N) "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1964
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� �terge�i aceast� cheie? (d/N) "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:1999
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 "Dori�i �ntr-adev�r s� revoca�i toate ID-urile utilizator selectate? (d/N) "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2000
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i acest ID utilizator? (d/N) "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2018
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i toat� cheia? (d/N) "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2029
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i subcheile selectate? (d/N) "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2031
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i aceast� subcheie? (d/N) "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2081
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "�ncrederea proprietar nu poate fi setat� c�nd este folosit� o baz� de date "
 "de �ncredere furnizat� de utilizator\n"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2123
 msgid "Set preference list to:\n"
 msgstr "Seteaz� lista de preferin�e ca:\n"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2129
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Dori�i �ntr-adev�r s� actualiza�i preferin�ele pentru ID-urile utilizator "
 "selectate? (d/N) "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2131
 msgid "Really update the preferences? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� actualiza�i preferin�ele? (d/N) "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2199
 msgid "Save changes? (y/N) "
 msgstr "Salva�i schimb�rile?  (d/N) "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2202
 msgid "Quit without saving? (y/N) "
 msgstr "Termina�i f�r� a salva?  (d/N) "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2212
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizarea secretului a e�uat: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2226
 msgid "Key not changed so no update needed.\n"
 msgstr "Cheia nu a fost schimbat� a�a c� nici o actualizare a fost necesar�.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2327
 msgid "Digest: "
 msgstr "Rezumat: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2379
 msgid "Features: "
 msgstr "Capabilit��i: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2390
 msgid "Keyserver no-modify"
 msgstr "Server de chei no-modify"
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2405 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Server de chei preferat: "
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2413 g10/keyedit.c:2414
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota�ie:"
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2624
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Nu exist� nici o preferin�� pentru un ID utilizator stil PGP 2.x.\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2683
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Aceast� cheie a fost revocat� pe %s de %s cheia %s\n"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2704
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Aceast� cheie poate fi revocat� de %s cheia %s"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2710
 msgid "(sensitive)"
 msgstr " (senzitiv)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keyedit.c:2726 g10/keyedit.c:2782 g10/keyedit.c:2843 g10/keyedit.c:2858
 #: g10/keylist.c:194 g10/keyserver.c:511
 #, c-format
 msgid "created: %s"
 msgstr "creat�: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2729 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
 #, c-format
 msgid "revoked: %s"
 msgstr "revocat�: %s"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2731 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "expirat�: %s"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2733 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
 #, c-format
 msgid "expires: %s"
 msgstr "expir�: %s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2735
 #, c-format
 msgid "usage: %s"
 msgstr "folosire: %s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2750
 #, c-format
 msgid "trust: %s"
 msgstr "�ncredere: %s"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2754
 #, c-format
 msgid "validity: %s"
 msgstr "validitate: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2761
 msgid "This key has been disabled"
 msgstr "Aceast� cheie a fost deactivat�"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2789 g10/keylist.c:200
 msgid "card-no: "
 msgstr "nr-card: "
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2813
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3456,17 +3461,17 @@ msgstr ""
 "corect� dac� nu reporni�i programul.\n"
 
 #
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "revocat�"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "expirat�"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2944
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3475,7 +3480,7 @@ msgstr ""
 "              Aceast� comand� poate cauza ca un alt ID utilizator\n"
 "              s� devin� ID-ul utilizator primar presupus.\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3005
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3484,74 +3489,74 @@ msgstr ""
 "AVERTISMENT: Aceasta este o cheie stil PGP2.  Ad�ugarea unei poze ID poate\n"
 "         cauza unele versiuni de PGP s� resping� aceast� cheie.\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3351
+#: g10/keyedit.c:3010 g10/keyedit.c:3345
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sunte�i �nc� sigur(�) c� dori�i s� o ad�uga�i? (d/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3016
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nu pute�i ad�uga o poz� ID la o cheie stil PGP2.\n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3156
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� bun�? (d/N/t)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3166
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� invalid�? (d/N/t)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3170
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� necunoscut�? (d/N/t)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3176
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�terge�i �ntr-adev�r aceast� auto-semn�tur�? (d/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3190
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3191
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3194
 msgid "Nothing deleted.\n"
 msgstr "Nu am �ters nimic.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3227 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "invalid(�)"
 
-#: g10/keyedit.c:3235
+#: g10/keyedit.c:3229
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:3242
+#: g10/keyedit.c:3236
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3237
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3246
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3340
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3561,364 +3566,364 @@ msgstr ""
 "             desemnat poate face ca unele versiuni de PGP s� resping� "
 "cheia.\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3351
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nu pute�i ad�uga un revocator desemnat la o cheie stil PGP 2.x.\n"
 
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3371
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3396
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "nu pot desemna o cheie stil PGP 2.x ca un revocator desemnat\n"
 
-#: g10/keyedit.c:3417
+#: g10/keyedit.c:3411
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "nu pute�i desemna o cheie ca propriul s�u revocator desemnat\n"
 
-#: g10/keyedit.c:3439
+#: g10/keyedit.c:3433
 msgid "this key has already been designated as a revoker\n"
 msgstr "aceast� cheie a fost deja desemnat� ca un revocator\n"
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3452
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVERTISMENT: desemnarea unei chei ca un revocator desemnat nu poate fi "
 "anulat�!\n"
 
-#: g10/keyedit.c:3464
+#: g10/keyedit.c:3458
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Sunte�i sigur(�) c� dori�i s� desemna�i aceast� cheie ca �i un revocator "
 "desemnat? (d/N) "
 
-#: g10/keyedit.c:3525
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "V� rug�m �terge�i selec�iile din cheile secrete.\n"
 
-#: g10/keyedit.c:3531
+#: g10/keyedit.c:3526
 msgid "Please select at most one subkey.\n"
 msgstr "V� rug�m selecta�i cel mult o subcheie.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3530
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Schimb timpul de expirare pentru o subcheie.\n"
 
-#: g10/keyedit.c:3538
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Schimb timpul de expirare pentru cheia primar�.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3582
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nu pute�i schimba data de expirare a unei chei v3\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3598
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3678
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVERTISMENT: subcheia de semnare %s nu este certificat� reciproc (cross-"
 "certified)\n"
 
-#: g10/keyedit.c:3679
+#: g10/keyedit.c:3684
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3841
+#: g10/keyedit.c:3846
 msgid "Please select exactly one user ID.\n"
 msgstr "V� rug�m selecta�i exact un ID utilizator.\n"
 
-#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
+#: g10/keyedit.c:3885 g10/keyedit.c:3995 g10/keyedit.c:4115 g10/keyedit.c:4256
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "auto-semn�tur� v3 s�rit� pentru ID-ul utilizator \"%s\"\n"
 
-#: g10/keyedit.c:4051
+#: g10/keyedit.c:4056
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduce�i URL-ul serverului de chei preferat: "
 
-#: g10/keyedit.c:4131
+#: g10/keyedit.c:4136
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i? (d/N) "
 
-#: g10/keyedit.c:4132
+#: g10/keyedit.c:4137
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i? (d/N) "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4199
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notare semn�tur�: "
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4348
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Suprascriu? (d/N) "
 
-#: g10/keyedit.c:4407
+#: g10/keyedit.c:4412
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nici un ID utilizator cu indicele %d\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4470
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nici un ID utilizator cu hash-ul %s\n"
 
-#: g10/keyedit.c:4492
+#: g10/keyedit.c:4497
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nici o subcheie cu indicele %d\n"
 
-#: g10/keyedit.c:4627
+#: g10/keyedit.c:4632
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID utilizator: \"%s\"\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4635 g10/keyedit.c:4699 g10/keyedit.c:4742
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "semnat� de cheia d-voastr� %s la %s%s%s\n"
 
-#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 msgid " (non-exportable)"
 msgstr " (non-exportabil�)"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4641
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aceast� semn�tur� a expirat pe %s.\n"
 
-#: g10/keyedit.c:4640
+#: g10/keyedit.c:4645
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sunte�i �nc� sigur(�) c� dori�i s� o revoca�i? (d/N) "
 
-#: g10/keyedit.c:4644
+#: g10/keyedit.c:4649
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Crea�i un certificat de revocare pentru aceast� semn�tur�? (d/N) "
 
-#: g10/keyedit.c:4671
+#: g10/keyedit.c:4676
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "A�i semnat aceste ID-uri utilizator pe cheia %s:\n"
 
-#: g10/keyedit.c:4697
+#: g10/keyedit.c:4702
 msgid " (non-revocable)"
 msgstr " (non-revocabil�)"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4709
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocat� de cheia d-voastr� %s pe %s\n"
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4731
 msgid "You are about to revoke these signatures:\n"
 msgstr "Sunte�i pe cale s� revoca�i aceste semn�turi:\n"
 
-#: g10/keyedit.c:4746
+#: g10/keyedit.c:4751
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� crea�i certificatele de revocare? (d/N) "
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4781
 msgid "no secret key\n"
 msgstr "nici o cheie secret�\n"
 
-#: g10/keyedit.c:4846
+#: g10/keyedit.c:4851
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
 
-#: g10/keyedit.c:4863
+#: g10/keyedit.c:4868
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVERTISMENT: o semn�tur� ID utilizator este datat� %d secunde �n viitor\n"
 
-#: g10/keyedit.c:4927
+#: g10/keyedit.c:4932
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Cheia %s este deja revocat�.\n"
 
-#: g10/keyedit.c:4989
+#: g10/keyedit.c:4994
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subcheia %s este deja revocat�.\n"
 
-#: g10/keyedit.c:5084
+#: g10/keyedit.c:5089
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Afi�ez poza ID %s de dimensiune %ld pentru cheia %s (uid %d)\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "preferin�a `%s' duplicat�\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 msgid "too many cipher preferences\n"
 msgstr "prea multe preferin�e de cifrare\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 msgid "too many digest preferences\n"
 msgstr "prea multe preferin�e de rezumat\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 msgid "too many compression preferences\n"
 msgstr "prea multe preferin�e de compresie\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "articol invalid `%s' �n �irul de preferin�e\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:876
 msgid "writing direct signature\n"
 msgstr "scriu semn�tur� direct�\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:915
 msgid "writing self signature\n"
 msgstr "scriu auto semn�tur�\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:965
 msgid "writing key binding signature\n"
 msgstr "scriu semn�tur� legat� de cheie\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
+#: g10/keygen.c:2776
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "lungime cheie invalid�; folosesc %u bi�i\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "lungime cheie rotunjit� la %u bi�i\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1331
 msgid "Sign"
 msgstr "Semneaz�"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1334
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1337
 msgid "Encrypt"
 msgstr "Cifreaz�"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1340
 msgid "Authenticate"
 msgstr "Autentific�"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1348
 msgid "SsEeAaQq"
 msgstr "SsCcAaTt"
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1367
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Ac�iuni posibile pentru o cheie %s: "
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1371
 msgid "Current allowed actions: "
 msgstr "Ac�iuni permise curent: "
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1376
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Comut� capabilitatea de semnare\n"
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1379
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Comut� capabilitatea de cifrare\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1382
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Comut� capabilitatea de autentificare\n"
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1385
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Terminat\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1441
 msgid "Please select what kind of key you want:\n"
 msgstr "Selecta�i ce fel de cheie dori�i:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1443
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA �i Elgamal (implicit)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (numai semnare)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1446
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (seteaz� singur capabilit��ile)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1448
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (numai cifrare)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (numai semnare)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (numai cifrare)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1453
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (seteaz� singur capabilit��ile)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1522
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Perechea de chei DSA va avea %u bi�i.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1532
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "cheile %s pot avea lungimea �ntre %u �i %u bi�i.\n"
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1539
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Ce lungime de cheie dori�i? (%u) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1553
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "dimensiunile cheii %s trebuie s� fie �n intervalul %u-%u\n"
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1559
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Lungimea cheii necesar� este %u bi�i\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1564 g10/keygen.c:1569
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rotunjit� prin adaos la %u bi�i\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1618
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3934,7 +3939,7 @@ msgstr ""
 "      <n>m = cheia expir� �n n luni\n"
 "      <n>y = cheia expir� �n n ani\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1629
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3950,38 +3955,38 @@ msgstr ""
 "      <n>m = semn�tura expir� �n n luni\n"
 "      <n>y = semn�tura expir� �n n ani\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Key is valid for? (0) "
 msgstr "Cheia este valid� pentru? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1655
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Semn�tura este valid� pentru? (%s) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1673
 msgid "invalid value\n"
 msgstr "valoare invalid�\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1680
 msgid "Key does not expire at all\n"
 msgstr "Cheia nu expir� deloc\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Signature does not expire at all\n"
 msgstr "Semn�tura nu expir� deloc\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1686
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Cheia expir� pe %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1687
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Semn�tura expir� pe %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1693
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3989,11 +3994,11 @@ msgstr ""
 "Sistemul d-voastr� nu poate afi�a date dup� 2038.\n"
 "Totu�i, acestea vor fi corect m�nuite p�n� �n 2106.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1698
 msgid "Is this correct? (y/N) "
 msgstr "Este aceasta corect? (d/N) "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1713
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4010,44 +4015,44 @@ msgstr ""
 "    \"Popa Ioan (popic�) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1726
 msgid "Real name: "
 msgstr "Nume real: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Invalid character in name\n"
 msgstr "Caracter invalid �n nume\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name may not start with a digit\n"
 msgstr "Numele nu poate �ncepe cu o cifr�\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1738
 msgid "Name must be at least 5 characters long\n"
 msgstr "Numele trebuie s� fie de cel pu�in 5 caractere\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1746
 msgid "Email address: "
 msgstr "Adres� de email: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1752
 msgid "Not a valid email address\n"
 msgstr "Nu este o adres� de email valid�\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1760
 msgid "Comment: "
 msgstr "Comentariu: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1766
 msgid "Invalid character in comment\n"
 msgstr "Caracter invalid �n comentariu\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1789
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Folosi�i setul de caractere `%s'\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1795
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4058,7 +4063,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1800
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "V� rug�m nu pune�i adresa de email �n numele real sau comentariu\n"
 
@@ -4073,23 +4078,23 @@ msgstr "V� rug�m nu pune�i adresa de email �n numele real sau comentariu\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoTt"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1826
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (T)Termin�? "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (O)K/(T)Termin�? "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:1846
 msgid "Please correct the error first\n"
 msgstr "V� rug�m corecta�i mai �nt�i eroarea\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1886
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4097,12 +4102,12 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a v� proteja cheia secret�.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:1896 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1902
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4113,7 +4118,7 @@ msgstr ""
 "O s� o fac oricum.  Pute�i schimba fraza-parol� oric�nd, folosind acest\n"
 "program cu op�iunea \"--edit-key\".\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:1924
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4125,50 +4130,50 @@ msgstr ""
 "�n timpul gener�rii numerelor prime; aceasta d� o �ans� generatorului de\n"
 "numere aleatoare o �ans� mai bun� de a aduna destul� entropie.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2722
 msgid "Key generation canceled.\n"
 msgstr "Generarea cheii a fost anulat�.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:2921 g10/keygen.c:3068
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scriu cheia public� �n `%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:2923 g10/keygen.c:3071
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "scriu talonul (stub) cheii secrete �n `%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:2926 g10/keygen.c:3074
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3057
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nu am g�sit nici un inel de chei public de scris: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3063
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nu am g�sit nici un inel de chei secret de scris: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3081
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3088
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3111
 msgid "public and secret key created and signed.\n"
 msgstr "cheile secret� �i public� au fost create �i semnate.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3122
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4178,12 +4183,12 @@ msgstr ""
 "s� folosi�i comanda \"--edit-key\" pentru a genera o subcheie secundar�\n"
 "pentru acest scop.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generarea cheii a e�uat: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4191,7 +4196,7 @@ msgstr ""
 "cheia a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4199,25 +4204,25 @@ msgstr ""
 "cheia a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3197 g10/keygen.c:3326
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOT�: crearea de subchei pentru chei v3 nu este conform OpenPGP\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3236 g10/keygen.c:3359
 msgid "Really create? (y/N) "
 msgstr "Crea�i �ntr-adev�r? (d/N) "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3524
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "stocarea cheii pe card a e�uat: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3571
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nu pot crea fi�ier de rezerv� `%s': %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3597
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOT�: copia de siguran�a a cheii cardului salvat� la `%s'\n"
@@ -4499,208 +4504,212 @@ msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:239
 #, 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:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s cheie de sesiune cifrat�\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:300
 #, 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:382
+#: g10/mainproc.c:381
 #, c-format
 msgid "public key is %s\n"
 msgstr "cheia public� este %s\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:438
 msgid "public key encrypted data: good DEK\n"
 msgstr "date cigrate cu cheie public�: DEK bun\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:471
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:475 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:479
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrat cu cheia %s, ID %s\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:493
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decriptarea cu cheie public� a e�uat: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:507
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrat� cu %lu fraze-parol�\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:509
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrat� cu 1 fraz�-parol�\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:540 g10/mainproc.c:562
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "presupunem date cifrate %s\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:548
 #, 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:581
+#: g10/mainproc.c:580
 msgid "decryption okay\n"
 msgstr "decriptare OK\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:584
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTISMENT: mesajul nu a avut integritatea protejat�\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:597
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTISMENT: mesajul cifrat a fost manipulat!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:603
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decriptarea a e�uat: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:624
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOT�: expeditorul a cerut \"doar-pentru-ochii-d-voastr�\"\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:626
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nume fi�ier original='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:711
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr ""
+
+#: g10/mainproc.c:839
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocare standalone - folosi�i \"gpg --import\" pentru a aplica\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1187
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Semn�tur� bun� din \"%s\""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1430
 msgid "signature verification suppressed\n"
 msgstr "verificare semn�tur� eliminat�\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1539
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "nu pot m�nui aceste semn�turi multiple\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1550
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Semn�tur� f�cut� %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1551
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               folosind cheia %s %s\n"
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1555
 #, 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:1544
+#: g10/mainproc.c:1575
 msgid "Key available at: "
 msgstr "Cheie disponibil� la: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Semn�tur� INCORECT� din \"%s\""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Semn�tur� expirat� din \"%s\""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Semn�tur� bun� din \"%s\""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr "[nesigur]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1797
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1895
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Semn�tur� expirat� %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1900
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Semn�tura expir� %s\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1903
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "semn�tur� %s, algoritm rezumat %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr "binar"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr "modtext"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 msgid "unknown"
 msgstr "necunoscut"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nu pot verifica semn�tura: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
 msgstr "nu o semn�tur� deta�at�\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:2037
 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:2013
+#: g10/mainproc.c:2045
 #, 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:2070
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr "semn�tur� de stil vechi (PGP 2.x)\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pachet root invalid detectat �n proc_tree()\n"
 
@@ -4835,18 +4844,18 @@ msgstr ""
 msgid "directory `%s' created\n"
 msgstr "director `%s' creat\n"
 
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:143
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nu pot m�nui algoritmul cu cheie public� %d\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:713
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVERTISMENT: cheie de sesiune cifrat� simetric poten�ial nesigur� "
 "(insecure)\n"
 
-#: g10/parse-packet.c:1159
+#: g10/parse-packet.c:1164
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpachetul de tip %d are bitul critic setat\n"
@@ -5598,12 +5607,12 @@ msgstr ""
 "AVERTISMENT: nu pot %%-expanda URL-ul serverului de chei (prea mare).  �l "
 "folosesc neexpandat.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:346
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "verificarea semn�turii create a e�uat: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:355
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s semn�tur� de la: \"%s\"\n"
@@ -5624,11 +5633,11 @@ msgstr ""
 msgid "signing:"
 msgstr "semnare:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1101
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "pute�i semna-�n-clar cu chei stil PGP 2.x �n modul --pgp2\n"
 
-#: g10/sign.c:1278
+#: g10/sign.c:1280
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "va fi folosit� cifrarea %s\n"
diff --git a/po/ru.po b/po/ru.po
index 95b1c0c62..0df3c9f6d 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: [email protected]\n"
-"POT-Creation-Date: 2006-12-04 15:05+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2005-06-22 02:53+0200\n"
 "Last-Translator: Maxim Britov <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -42,10 +42,10 @@ msgstr "сохранение секретного ключа в `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
+#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -78,9 +78,9 @@ msgstr "не могу прочитать `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "замечание: файл random_seed не обновлен\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
+#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
+#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "не могу создать `%s': %s\n"
@@ -391,14 +391,14 @@ msgstr "Карта OpenPGP недоступна: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Обнаружена карта OpenPGP номер %s \n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
+#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "невозможно сделать это в пакетном режиме\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
+#: g10/keygen.c:1456
 msgid "Your selection? "
 msgstr "Ваш выбор (?-подробнее)? "
 
@@ -564,8 +564,8 @@ msgstr "   (2) Ключ шифрования\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Ключ аутентификации\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
+#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Неправильный выбор.\n"
 
@@ -585,7 +585,7 @@ msgstr "секретные части ключа недоступны\n"
 msgid "secret key already stored on a card\n"
 msgstr "секретный ключ уже сохранен в карте\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1319 g10/keyedit.c:1351
 msgid "quit this menu"
 msgstr "выйти из этого меню"
 
@@ -593,7 +593,7 @@ msgstr "выйти из этого меню"
 msgid "show admin commands"
 msgstr "показать управляющие команды"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1322 g10/keyedit.c:1354
 msgid "show this help"
 msgstr "показать данную справку"
 
@@ -647,7 +647,7 @@ msgstr "меню изменения или разблокировки PIN"
 msgid "verify the PIN and list all data"
 msgstr "проверить PIN  и показать все данные"
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1457 g10/keyedit.c:1617
 msgid "Command> "
 msgstr "Команда> "
 
@@ -663,7 +663,7 @@ msgstr "Команды администрирования разрешены\n"
 msgid "Admin commands are not allowed\n"
 msgstr "Команды администрирования не разрешены\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1602 g10/keyedit.c:2238
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Недопустимая команда  (список команд: \"help\")\n"
 
@@ -718,7 +718,7 @@ msgstr "Повторите ввод PIN: "
 msgid "PIN not correctly repeated; try again"
 msgstr "повторный ввод PIN некорректен; попробуйте еще раз"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -728,7 +728,7 @@ 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:3392 g10/keyserver.c:1705
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3386 g10/keyserver.c:1705
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -774,7 +774,7 @@ msgstr "имеется секретный ключ для открытого к�
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "сначала используйте опцию \"--delete-secret-keys\".\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:213 g10/sign.c:1286
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "ошибка при создании ключевой фразы (пароля): %s\n"
@@ -841,12 +841,12 @@ msgstr "Вы не можете использовать %s в режиме %s\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s зашифровано для: \"%s\"\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:292
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "Данные зашифрованы алгоритмом %s\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:296
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "зашифровано неизвестным алгоритмом %d\n"
@@ -984,7 +984,7 @@ msgstr "ВНИМАНИЕ: секретный ключ %s не имеет про�
 msgid "WARNING: nothing exported\n"
 msgstr "ВНИМАНИЕ: нечего экспортировать\n"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:379
 msgid ""
 "@Commands:\n"
 " "
@@ -992,127 +992,127 @@ msgstr ""
 "@Команды:\n"
 " "
 
-#: g10/gpg.c:380
+#: g10/gpg.c:381
 msgid "|[file]|make a signature"
 msgstr "|[file]|создать подпись к файлу"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|создать прозрачную подпись к файлу"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:383
 msgid "make a detached signature"
 msgstr "создать отделенную подпись"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "encrypt data"
 msgstr "зашифровать данные"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "encryption only with symmetric cipher"
 msgstr "зашифровать только симметричным шифром"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "decrypt data (default)"
 msgstr "расшифровать данные (по умолчанию)"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "verify a signature"
 msgstr "проверить подпись"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "list keys"
 msgstr "вывести список ключей"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:394
 msgid "list keys and signatures"
 msgstr "вывести список ключей и подписей"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "list and check key signatures"
 msgstr "вывести и проверить подписи ключей"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "list keys and fingerprints"
 msgstr "вывести список ключей и их отпечатков"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "list secret keys"
 msgstr "вывести список секретных ключей"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "generate a new key pair"
 msgstr "создать новую пару ключей"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "remove keys from the public keyring"
 msgstr "удалить ключи из таблицы открытых ключей"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "remove keys from the secret keyring"
 msgstr "удалить ключи из таблицы закрытых ключей"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "sign a key"
 msgstr "подписать ключ"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "sign a key locally"
 msgstr "подписать ключ локально"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:404
 msgid "sign or edit a key"
 msgstr "подписать или редактировать ключ"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "generate a revocation certificate"
 msgstr "создать сертификат отзыва"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "export keys"
 msgstr "экспортировать ключи"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:408
 msgid "export keys to a key server"
 msgstr "экспортировать ключи на сервер ключей"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:409
 msgid "import keys from a key server"
 msgstr "импортировать ключи с сервера ключей"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "search for keys on a key server"
 msgstr "искать ключи на сервере ключей"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:413
 msgid "update all keys from a keyserver"
 msgstr "обновить все ключи с сервера ключей"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:417
 msgid "import/merge keys"
 msgstr "импортировать/объединить ключи"
 
-#: g10/gpg.c:419
+#: g10/gpg.c:420
 msgid "print the card status"
 msgstr "показать состояние карты"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:421
 msgid "change data on a card"
 msgstr "изменить данные на карте"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:422
 msgid "change a card's PIN"
 msgstr "сменить PIN карты"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "update the trust database"
 msgstr "обновить таблицу доверий"
 
-#: g10/gpg.c:437
+#: g10/gpg.c:438
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|вывести хэши файлов"
 
-#: g10/gpg.c:441 g10/gpgv.c:71
+#: g10/gpg.c:442 g10/gpgv.c:70
 msgid ""
 "@\n"
 "Options:\n"
@@ -1122,51 +1122,51 @@ msgstr ""
 "Параметры:\n"
 " "
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "create ascii armored output"
 msgstr "вывод в ASCII формате"
 
-#: g10/gpg.c:445
+#: g10/gpg.c:446
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|зашифровать для получателя NAME"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "use this user-id to sign or decrypt"
 msgstr "использовать данный User ID для подписывания и расшифрования"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:458
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|установить уровень сжатия N (по умолчанию - 0)"
 
-#: g10/gpg.c:462
+#: g10/gpg.c:463
 msgid "use canonical text mode"
 msgstr "использовать канонический текстовый режим"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:477
 msgid "use as output file"
 msgstr "вывод в указанный файл"
 
-#: g10/gpg.c:478 g10/gpgv.c:73
+#: g10/gpg.c:479 g10/gpgv.c:72
 msgid "verbose"
 msgstr "подробно"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "do not make any changes"
 msgstr "не делать никаких изменений"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:491
 msgid "prompt before overwriting"
 msgstr "спросить перед перезаписью"
 
-#: g10/gpg.c:531
+#: g10/gpg.c:532
 msgid "use strict OpenPGP behavior"
 msgstr "строго следовать стандарту OpenPGP"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:533
 msgid "generate PGP 2.x compatible messages"
 msgstr "создает сообщение совместимым с PGP 2.x"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1174,7 +1174,7 @@ msgstr ""
 "@\n"
 "(См. документацию для более полного ознакомления с командами и параметрами)\n"
 
-#: g10/gpg.c:564
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1194,15 +1194,15 @@ msgstr ""
 " --list-keys [имена]        показать ключи\n"
 " --fingerprint [имена]      показать отпечатки\n"
 
-#: g10/gpg.c:763 g10/gpgv.c:98
+#: g10/gpg.c:766 g10/gpgv.c:97
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "О найденных ошибка сообщайте <[email protected]>.\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:783
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1212,7 +1212,7 @@ msgstr ""
 "подписать и проверить, зашифровать или расшифровать\n"
 "операция по умолчанию зависит от входных данных\n"
 
-#: g10/gpg.c:794
+#: g10/gpg.c:797
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1220,92 +1220,92 @@ msgstr ""
 "\n"
 "Поддерживаются следующие алгоритмы:\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid "Pubkey: "
 msgstr "С открытым ключом: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2310
+#: g10/gpg.c:806 g10/keyedit.c:2304
 msgid "Cipher: "
 msgstr "Симметричные шифры: "
 
-#: g10/gpg.c:809
+#: g10/gpg.c:812
 msgid "Hash: "
 msgstr "Хэш-функции: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2356
+#: g10/gpg.c:818 g10/keyedit.c:2350
 msgid "Compression: "
 msgstr "Алгоритмы сжатия: "
 
-#: g10/gpg.c:898
+#: g10/gpg.c:901
 msgid "usage: gpg [options] "
 msgstr "использование: gpg [опции] "
 
-#: g10/gpg.c:1046
+#: g10/gpg.c:1049
 msgid "conflicting commands\n"
 msgstr "несовместимые команды\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1067
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "отсутствует знак = в определении группы `%s'\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец домашнего каталога `%s'\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец файла конфигурации `%s'\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец файла модуля расширения `%s'\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1276
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к домашнему каталогу `%s'\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к файлу конфигурации `%s'\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к файлу модуля расширения `%s'\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1288
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего домашний каталог `%s'\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего файл конфигурации `%s'\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего модуль расширения `%s'\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1300
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа к каталогу содержащему домашний каталог "
 "`%s'\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1313,492 +1313,497 @@ msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа к каталогу содержащему файл "
 "конфигурации `%s'\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа к каталогу содержащему файл модуля "
 "расширения `%s'\n"
 
-#: g10/gpg.c:1444
+#: g10/gpg.c:1447
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "неизвестный параметр в файле конфигурации `%s'\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "переключение между просмотром открытых и закрытых ключей"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/gpg.c:1954
+#: g10/gpg.c:1957
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "ЗАМЕЧАНИЕ: старый файл конфигурации по умолчанию `%s' проигнорирован\n"
 
-#: g10/gpg.c:1996
+#: g10/gpg.c:1999
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
 
-#: g10/gpg.c:2000
+#: g10/gpg.c:2003
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл конфигурации `%s': %s\n"
 
-#: g10/gpg.c:2007
+#: g10/gpg.c:2010
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "параметры конфигурации взяты из файла `%s'\n"
 
-#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ЗАМЕЧАНИЕ: %s не предназначен для нормального применения!\n"
 
-#: g10/gpg.c:2236
+#: g10/gpg.c:2239
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "расширение шифра `%s' не загружено вследствие небезопасных прав доступа\n"
 
-#: g10/gpg.c:2402 g10/gpg.c:2414
+#: g10/gpg.c:2405 g10/gpg.c:2417
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2494
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' недопустимая таблица символов\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 msgid "could not parse keyserver URL\n"
 msgstr "не могу проанализировать URL сервера ключей\n"
 
 # test it
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопустимые параметры для сервера ключей\n"
 
 # test it
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 msgid "invalid keyserver options\n"
 msgstr "недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопустимый список параметров\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 msgid "invalid list options\n"
 msgstr "недопустимый список параметров\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "`%s' недопустимый срок действия подписи\n"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
 # test it
-#: g10/gpg.c:2595
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопустимые параметры проверки \n"
 
 # test it
-#: g10/gpg.c:2598
+#: g10/gpg.c:2603
 msgid "invalid verify options\n"
 msgstr "недопустимые параметры проверки\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запуска для %s\n"
 
 # test it
-#: g10/gpg.c:2768
+#: g10/gpg.c:2773
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недопустимые параметры проверки \n"
 
-#: g10/gpg.c:2771
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти!\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ВНИМАНИЕ: %s заместит %s\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не допускается использовать с %s!\n"
 
-#: g10/gpg.c:2858
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s не имеет смысла совместно с %s!\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2875
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "ПРЕДУПРЕЖДАЮ: %s недоступен в данной версии\n"
 
-#: g10/gpg.c:2880
+#: g10/gpg.c:2890
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "не будет работать с небезопасной памятью из-за %s\n"
 
-#: g10/gpg.c:2894
+#: g10/gpg.c:2904
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
 
-#: g10/gpg.c:2900
+#: g10/gpg.c:2910
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Вы не можете одновременно подписать и зашифровать в режиме --pgp2\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2916
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Вы должны использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
 
-#: g10/gpg.c:2919
+#: g10/gpg.c:2929
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "для зашифрования сообщения в режиме --pgp2 требуется шифр IDEA\n"
 
-#: g10/gpg.c:2986 g10/gpg.c:3010
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/gpg.c:2992 g10/gpg.c:3016
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция\n"
 
-#: g10/gpg.c:2998
+#: g10/gpg.c:3008
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран неверный алгоритм сжатия\n"
 
-#: g10/gpg.c:3004
+#: g10/gpg.c:3014
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция для сертификации\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3029
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3031
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3033
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3035
 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:3027
+#: g10/gpg.c:3037
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3040
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ЗАМЕЧАНИЕ: простой режим S2K (0) строго не рекомендуется\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3044
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3051
 msgid "invalid default preferences\n"
 msgstr "недопустимые предпочтения по умолчанию\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3060
 msgid "invalid personal cipher preferences\n"
 msgstr "недопустимые персональные предпочтения шифра\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3064
 msgid "invalid personal digest preferences\n"
 msgstr "недопустимые персональные предпочтения хэш-функции\n"
 
-#: g10/gpg.c:3058
+#: g10/gpg.c:3068
 msgid "invalid personal compress preferences\n"
 msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
 
-#: g10/gpg.c:3091
+#: g10/gpg.c:3101
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s пока не работает совместно с %s!\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3148
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать шифрование `%s' в режиме %s\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3153
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать хэш-функцию `%s' в режиме %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3158
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать сжатие `%s' в режиме %s\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3271
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [filename]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filename]"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3291
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "симметричное шифрование `%s' не удалось: %s\n"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filename]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3314
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [имяфайла]"
 
-#: g10/gpg.c:3306
+#: g10/gpg.c:3316
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "нельзя использовать --symmetric --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3319
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [filename]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filename]"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3365
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [имяфайла]"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3367
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3370
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --sign --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filename]"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filename]"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filename]"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3426
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [commands]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [keyring]"
 
-#: g10/gpg.c:3560
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "сбой при отправке на сервер ключей: %s\n"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3572
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "сбой при получении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3564
+#: g10/gpg.c:3574
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "сбой при экспорте ключа: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3585
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "сбой при поиске на сервере ключей: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3595
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "сбой при обновлении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразования из ASCII формата: %s\n"
 
-#: g10/gpg.c:3644
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразования в ASCII формат: %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "недопустимая хэш-функция `%s'\n"
 
-#: g10/gpg.c:3854
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[filename]"
 
-#: g10/gpg.c:3858
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "Набирайте Ваше сообщение ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4172
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL политики сертификации неверен\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4174
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL политики подписи неверен\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4207
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
@@ -1823,42 +1828,42 @@ msgstr ""
 "Дефектный ключ %s признан пригодным согласно параметра --allow-non-"
 "selfsigned-uid\n"
 
-#: g10/getkey.c:2380 g10/keyedit.c:3712
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "нет секретного подключа для открытого подключа %s - игнорируем\n"
 
-#: g10/getkey.c:2611
+#: g10/getkey.c:2614
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "использую подклключ %s вместо главного ключа %s\n"
 
-#: g10/getkey.c:2658
+#: g10/getkey.c:2661
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "ключ %s: секретный ключ без открытого ключа - пропущен\n"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:73
 msgid "be somewhat more quiet"
 msgstr "уменьшить количество выводимой информации"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "take the keys from this keyring"
 msgstr "используются ключи из этой таблицы ключей"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:76
 msgid "make timestamp conflicts only a warning"
 msgstr "при несоответствии отметки времени - только предупреждением"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:77
 msgid "|FD|write status info to this FD"
 msgstr "|FD|выводить инфромацию в файл с дескриптором FD"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:101
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Использовать: gpgv [параметры] [файлы] (-h для подсказки)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:104
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2396,7 +2401,7 @@ msgstr "ключ %s: новый ключ - пропущен\n"
 msgid "no writable keyring found: %s\n"
 msgstr "нет доступной для записи таблицы ключей: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "сохраняю в `%s'\n"
@@ -2753,41 +2758,41 @@ msgstr ""
 "Введите домен, ограничивающий использование данной подписи, или пустую "
 "строку, если нет ограничений.\n"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User ID \"%s\" отозван."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
+#: g10/keyedit.c:890 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Вы уверены, что хотите это подписать? (y/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
+#: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  Не могу подписать.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User ID \"%s\" просрочен."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User ID \"%s\" без самоподписи."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "User ID \"%s\"  подписываем."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 msgid "Sign it? (y/N) "
 msgstr "Действительно подписать? (y/N)"
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2796,11 +2801,11 @@ msgstr ""
 "Самоподпись у \"%s\"\n"
 "это подпись PGP 2.x -стиля.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Вы хотите сделать это OpenPGP самоподписью? (y/N) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2809,11 +2814,11 @@ msgstr ""
 "Ваша текущая подпись на  \"%s\"\n"
 "просрочена.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Вы хотите сделать новую подпись для замены просроченной? (y/N) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2822,55 +2827,55 @@ msgstr ""
 "Ваша текущая подпись на \"%s\"\n"
 "является локальной.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Вы хотите сделать это полностью экспортируемой подписью? (y/N) "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" уже локально подписан ключом %s\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" уже подписан ключом %s\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Вы действительно хотите снова подписать это? (y/N)"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Нечего подписывать ключом %s\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Данный ключ просрочен!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Срок действительности данного ключа истекает %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "Вы хотите, чтобы Ваша подпись была действительна до того же времени?(Y/n) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:883
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Вы не можете сделать OpenPGP подпись на PGP 2.x ключе в режиме --pgp2.\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:885
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Это сделает ключ несовместимым с PGP 2.x.\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:910
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2880,31 +2885,31 @@ msgstr ""
 "чье имя указано в User ID ключа?\n"
 "  Если Вы не знаете что ответить, введите \"0\".\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Не буду отвечать.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Я не проверял совсем.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Я проверил частично.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Я проверил очень тщательно.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:927
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ваше решение? (введите '?' для получения информации)"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:951
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2913,74 +2918,74 @@ msgstr ""
 "Вы уверены, что хотите подписать этот ключ\n"
 "своим ключом: \"%s\" (%s)\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:958
 msgid "This will be a self-signature.\n"
 msgstr "Это будет самоподпись.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:964
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "ВНИМАНИЕ: подпись не будет помечена как не экспортируемая.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:972
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "ВНИМАНИЕ: подпись не будет помечена как не отзываемая.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:982
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Подпись будет помечена как не экспортируемая.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:989
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Подпись будет помечена как не отзываемая.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:996
 msgid "I have not checked this key at all.\n"
 msgstr "Я совсем не проверял этот ключ.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1001
 msgid "I have checked this key casually.\n"
 msgstr "Я проверил этот ключ только частично.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1006
 msgid "I have checked this key very carefully.\n"
 msgstr "Я очень тщательно проверил этот ключ.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1016
 msgid "Really sign? (y/N) "
 msgstr "Действительно подписать? (y/N)"
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
-#: g10/keyedit.c:5004 g10/sign.c:352
+#: g10/keyedit.c:1061 g10/keyedit.c:4793 g10/keyedit.c:4884 g10/keyedit.c:4948
+#: g10/keyedit.c:5009 g10/sign.c:351
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "не удалось подписать: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1126
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1137 g10/keygen.c:3215
 msgid "This key is not protected.\n"
 msgstr "Данный ключ не защищен.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Секретная часть главного ключа отсутствует.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1145 g10/keygen.c:3218
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Секретная часть главного ключа сохранена на карте.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1149 g10/keygen.c:3222
 msgid "Key is protected.\n"
 msgstr "Ключ защищен.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1173
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Не могу редактировать данный ключ: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1179
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2988,11 +2993,11 @@ msgstr ""
 "Введите новый пароль для данного секретного ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1188 g10/keygen.c:1895
 msgid "passphrase not correctly repeated; try again"
 msgstr "повторный ввод пароля некорректен; попробуйте еще раз"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1193
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3000,186 +3005,186 @@ msgstr ""
 "Вы не хотите задать пароль? Это очень ПЛОХАЯ идея!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1196
 msgid "Do you really want to do this? (y/N) "
 msgstr "Вы действительно хотите сделать это? (y/N)"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1267
 msgid "moving a key signature to the correct place\n"
 msgstr "перемещение подписи ключа в правильное место\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1353
 msgid "save and quit"
 msgstr "сохранить и выйти"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1356
 msgid "show key fingerprint"
 msgstr "показать отпечаток ключа"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1357
 msgid "list key and user IDs"
 msgstr "вывести список ключей и User ID"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1359
 msgid "select user ID N"
 msgstr "выбрать User ID N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1360
 msgid "select subkey N"
 msgstr "выбрать подключ N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1361
 msgid "check signatures"
 msgstr "проверка подписей"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1366
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "подписать выбранные User ID [* описание соотв. команд см. ниже]"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs locally"
 msgstr "локально подписать выбранные User ID"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a trust signature"
 msgstr "подписать выбранные User ID - trust подписью"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "подписать выбранные User ID без возможности отзыва"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1379
 msgid "add a user ID"
 msgstr "добавить User ID"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1381
 msgid "add a photo ID"
 msgstr "добавить фото ID"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1383
 msgid "delete selected user IDs"
 msgstr "удалить выбранные User ID"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1388
 msgid "add a subkey"
 msgstr "добавить подключ"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1392
 msgid "add a key to a smartcard"
 msgstr "добавить ключ на карту"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1394
 msgid "move a key to a smartcard"
 msgstr "переместить ключ на карту"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1396
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1400
 msgid "delete selected subkeys"
 msgstr "удалить выбранные подключи"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1402
 msgid "add a revocation key"
 msgstr "добавить ключ отзыва"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1404
 msgid "delete signatures from the selected user IDs"
 msgstr "удалить подписи у выбранных User ID"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1406
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "сменить срок действительности ключа или выбранных подключей"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1408
 msgid "flag the selected user ID as primary"
 msgstr "пометить выбранные User ID как главные"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1410
 msgid "toggle between the secret and public key listings"
 msgstr "переключение между просмотром открытых и закрытых ключей"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1413
 msgid "list preferences (expert)"
 msgstr "список предпочтений (экспертам)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1415
 msgid "list preferences (verbose)"
 msgstr "список предпочтений (подробный)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1417
 msgid "set preference list for the selected user IDs"
 msgstr "установить список предпочтений для выбранных User ID"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "установить URL предпочитаемого сервера ключей для выбранных User ID"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "установить список предпочтений для выбранных User ID"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "сменить пароль"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "изменить уровень доверия владельцу"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1432
 msgid "revoke signatures on the selected user IDs"
 msgstr "отозвать подписи у выбранных User ID"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1434
 msgid "revoke selected user IDs"
 msgstr "отзыв выбранных User ID"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1439
 msgid "revoke key or selected subkeys"
 msgstr "отзыв ключа или выбранных подключей"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1440
 msgid "enable key"
 msgstr "включить ключ"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1441
 msgid "disable key"
 msgstr "отключить ключ"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1442
 msgid "show selected photo IDs"
 msgstr "показать выбранные фото ID"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1446
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1564
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "ошибка чтения секретного блока ключа \"%s\": %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1582
 msgid "Secret key is available.\n"
 msgstr "Секретный ключ доступен.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1663
 msgid "Need the secret key to do this.\n"
 msgstr "Для данного действия нужен секретный ключ.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1671
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Сначала воспользуйтесь командой \"toggle\".\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1690
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3191,157 +3196,157 @@ msgstr ""
 "  `t' - trust подпись (tsign), `nr' - без возможности отзыва\n"
 "  (nrsign) или любым их сочетанием (ltsign, tnrsign и т.д.).\n"
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1730
 msgid "Key is revoked."
 msgstr "Ключ отозван."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1749
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Вы действительно хотите подписать ВСЕ User ID? (y/N)"
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1756
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Подсказка: Выберите User IDs для подписи\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1765
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "неизвестный тип подписи `%s'\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1788
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Данная команда не допустима в режиме %s.\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
 msgid "You must select at least one user ID.\n"
 msgstr "Вы должны выбрать хотя бы один User ID.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1812
 msgid "You can't delete the last user ID!\n"
 msgstr "Вы не можете удалить последний User ID!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1814
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Вы действительно хотите удалить ВСЕ выбранные User IDs? (y/N)"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1815
 msgid "Really remove this user ID? (y/N) "
 msgstr "Вы действительно хотите удалить данный User ID? (y/N)"
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1865
 msgid "Really move the primary key? (y/N) "
 msgstr "Действительно удалить главный ключ? (y/N)"
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1877
 msgid "You must select exactly one key.\n"
 msgstr "Вы должны выбрать хотя бы один ключ.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1905
 msgid "Command expects a filename argument\n"
 msgstr "Команда ожидает аргумент - имя файла\n"
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1919
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Не могу открыть `%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1936
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1960
 msgid "You must select at least one key.\n"
 msgstr "Вы должны выбрать хотя бы один ключ.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1963
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Вы действительно хотите удалить выбранные ключи? (y/N)"
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1964
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Вы действительно хотите удалить данный ключ? (y/N)"
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:1999
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Действительно отозвать ВСЕ выбранные User ID? (y/N)"
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2000
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Действительно отозвать данный User ID? (y/N)"
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2018
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Вы действительно хотите отозвать ключ целиком? (y/N)"
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2029
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Вы действительно хотите отозвать выбранные подключи? (y/N)"
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2031
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Вы действительно хотите отозвать данный подключ? (y/N)"
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2081
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "Невозможно присвоить степень доверия пока используется указанная "
 "пользователем таблица доверий\n"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2123
 msgid "Set preference list to:\n"
 msgstr "установить предпочтения в:\n"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2129
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Действительно обновить предпочтения для выбранных User ID? (y/N)"
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2131
 msgid "Really update the preferences? (y/N) "
 msgstr "Действительно обновить предпочтения? (y/N)"
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2199
 msgid "Save changes? (y/N) "
 msgstr "Сохранить изменения? (y/N)"
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2202
 msgid "Quit without saving? (y/N) "
 msgstr "Выйти без сохранения? (y/N)"
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2212
 #, c-format
 msgid "update failed: %s\n"
 msgstr "сбой при обновлении: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "сбой при обновлений секретного ключа: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2226
 msgid "Key not changed so no update needed.\n"
 msgstr "ключ не изменялся - обновление не нужно.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2327
 msgid "Digest: "
 msgstr "Хэш-функции: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2379
 msgid "Features: "
 msgstr "Опции: "
 
 # check it
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2390
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2405 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Предпочитаемый сервер ключей: "
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2413 g10/keyedit.c:2414
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3349,71 +3354,71 @@ msgstr ""
 "Параметры:\n"
 " "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2624
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Не может быть предпочтений в PGP 2.x-стиле User ID.\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2683
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Данный ключ был отозван %s - %s ключом %s\n"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2704
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Данный ключ может быть отозван %s ключом %s "
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2710
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keyedit.c:2726 g10/keyedit.c:2782 g10/keyedit.c:2843 g10/keyedit.c:2858
 #: g10/keylist.c:194 g10/keyserver.c:511
 #, c-format
 msgid "created: %s"
 msgstr "создан: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2729 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
 #, c-format
 msgid "revoked: %s"
 msgstr "отозван: %s"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2731 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "просрочен с: %s"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2733 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
 #, c-format
 msgid "expires: %s"
 msgstr "годен до: %s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2735
 #, c-format
 msgid "usage: %s"
 msgstr "применяемость: %s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2750
 #, c-format
 msgid "trust: %s"
 msgstr "доверие: %s"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2754
 #, c-format
 msgid "validity: %s"
 msgstr "достоверность: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2761
 msgid "This key has been disabled"
 msgstr "Данный ключ отключен"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2789 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2813
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3421,18 +3426,18 @@ msgstr ""
 "Учтите, что показанные степени достоверности могут быть неверными,\n"
 "пока Вы не перезапустите программу.\n"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "отозван"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "просрочен с"
 
 # check it
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2944
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3440,7 +3445,7 @@ msgstr ""
 "ВНИМАНИЕ: нет User ID помеченного как главный.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3005
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3449,74 +3454,74 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP2.  Добавление фото ID может в некоторых версиях\n"
 "         PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3351
+#: g10/keyedit.c:3010 g10/keyedit.c:3345
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Вы уверены, что хотите добавить это? (y/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3016
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Вы не можете добавить фото ID в ключ PGP2-типа.\n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3156
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Удалить данную действительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3166
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Удалить данную недействительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3170
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Удалить данную неизвестную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3176
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Действительно удалить данную самоподпись? (y/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3190
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Удалена %d подпись.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3191
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Удалено %d подписи.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3194
 msgid "Nothing deleted.\n"
 msgstr "Ничего не удалено.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3227 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "недопустимый"
 
-#: g10/keyedit.c:3235
+#: g10/keyedit.c:3229
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID \"%s\" уже очищен\n"
 
-#: g10/keyedit.c:3242
+#: g10/keyedit.c:3236
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "ключ %s: \"%s\" %d подпись очищена\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3237
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "ключ %s: \"%s\" %d очищеных подписей\n"
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID \"%s\" уже очищен\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3246
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID \"%s\" уже очищен\n"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3340
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3525,359 +3530,359 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP 2.x. Добавление назначенного отзывающим ключа\n"
 "          может в некоторых версиях PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3351
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Вы не можете добавить назначенный отзывающим ключ в PGP 2.x ключ.\n"
 
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3371
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Укажите User ID ключа, назначенного отзывающим: "
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3396
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "нельзя назначить ключ PGP 2.x отзывающим\n"
 
-#: g10/keyedit.c:3417
+#: g10/keyedit.c:3411
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "ключ не может быть назначен отзывающим сам себя\n"
 
-#: g10/keyedit.c:3439
+#: g10/keyedit.c:3433
 msgid "this key has already been designated as a revoker\n"
 msgstr "этот ключ уже назначен отзывающим\n"
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3452
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "ВНИМАНИЕ: назначение ключа отзывающим невозможно будет отменить!\n"
 
-#: g10/keyedit.c:3464
+#: g10/keyedit.c:3458
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N)"
 
-#: g10/keyedit.c:3525
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Снимите выделение с секретного ключа.\n"
 
-#: g10/keyedit.c:3531
+#: g10/keyedit.c:3526
 msgid "Please select at most one subkey.\n"
 msgstr "Выделите не менее одного подключа.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3530
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Смена срока действительности подключа.\n"
 
-#: g10/keyedit.c:3538
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Смена срока действия главного ключа\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3582
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Вы не можете изменить срок действия v3 ключа\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3598
 msgid "No corresponding signature in secret ring\n"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3678
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "ВНИМАНИЕ: подписываемый подключ %s не имеет перекрестной сертификации\n"
 
-#: g10/keyedit.c:3679
+#: g10/keyedit.c:3684
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3841
+#: g10/keyedit.c:3846
 msgid "Please select exactly one user ID.\n"
 msgstr "Выберите только один User ID.\n"
 
-#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
+#: g10/keyedit.c:3885 g10/keyedit.c:3995 g10/keyedit.c:4115 g10/keyedit.c:4256
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропуск v3 самоподписи на User ID \"%s\"\n"
 
-#: g10/keyedit.c:4051
+#: g10/keyedit.c:4056
 msgid "Enter your preferred keyserver URL: "
 msgstr "Введите URL предпочтаемого сервера ключей: "
 
-#: g10/keyedit.c:4131
+#: g10/keyedit.c:4136
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Вы действительно хотите заменить его? (y/N)"
 
-#: g10/keyedit.c:4132
+#: g10/keyedit.c:4137
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Вы действительно хотите удалить его? (y/N)"
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4199
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Примечание к подписи"
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4348
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Перезаписать (y/N)? "
 
-#: g10/keyedit.c:4407
+#: g10/keyedit.c:4412
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Нет User ID с индексом %d\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4470
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Нет User ID с хешем %s\n"
 
 # c-format
-#: g10/keyedit.c:4492
+#: g10/keyedit.c:4497
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Нет подключа с индексом %d\n"
 
-#: g10/keyedit.c:4627
+#: g10/keyedit.c:4632
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User ID: \"%s\"\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4635 g10/keyedit.c:4699 g10/keyedit.c:4742
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "подписано Вашим ключом %s от %s%s%s\n"
 
-#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 msgid " (non-exportable)"
 msgstr " (не экспортируемая)"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4641
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Срок действительности подписи закончился %s.\n"
 
-#: g10/keyedit.c:4640
+#: g10/keyedit.c:4645
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Вы уверены, что хотите отозвать? (y/N) "
 
-#: g10/keyedit.c:4644
+#: g10/keyedit.c:4649
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
 
-#: g10/keyedit.c:4671
+#: g10/keyedit.c:4676
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вы подписали данные User ID на ключе %s:\n"
 
-#: g10/keyedit.c:4697
+#: g10/keyedit.c:4702
 msgid " (non-revocable)"
 msgstr " (не отзываемая)"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4709
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "отзыв Вашим ключом %s от %s\n"
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4731
 msgid "You are about to revoke these signatures:\n"
 msgstr "Вы отзываете следующие подписи:\n"
 
-#: g10/keyedit.c:4746
+#: g10/keyedit.c:4751
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Действительно создать сертификат отзыва? (y/N) "
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4781
 msgid "no secret key\n"
 msgstr "нет секретного ключа\n"
 
-#: g10/keyedit.c:4846
+#: g10/keyedit.c:4851
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" уже отозван\n"
 
-#: g10/keyedit.c:4863
+#: g10/keyedit.c:4868
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ВНИМАНИЕ: User ID подпись датирована %d секундами в будущем\n"
 
-#: g10/keyedit.c:4927
+#: g10/keyedit.c:4932
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Ключ %s уже отозван\n"
 
-#: g10/keyedit.c:4989
+#: g10/keyedit.c:4994
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Подключ %s уже отозван\n"
 
-#: g10/keyedit.c:5084
+#: g10/keyedit.c:5089
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Показ %s фото ID размера %ld для ключа %s (uid %d)\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "предпочтение `%s' дублируется\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 msgid "too many cipher preferences\n"
 msgstr "слишком много предпочтений для шифра\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 msgid "too many digest preferences\n"
 msgstr "слишком много предпочтений для хэш-функций\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 msgid "too many compression preferences\n"
 msgstr "слишком много предпочтений для методов сжатия\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "недопустимое вхождение `%s' в строке предпочтений\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:876
 msgid "writing direct signature\n"
 msgstr "writing direct signature\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:915
 msgid "writing self signature\n"
 msgstr "сохраняем самоподпись\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:965
 msgid "writing key binding signature\n"
 msgstr "сохраняем объединяющую подпись\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
+#: g10/keygen.c:2776
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "неверный размер ключа; используется %u бит\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "размер ключа приведен к %u битам\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1331
 msgid "Sign"
 msgstr ""
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1334
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1337
 msgid "Encrypt"
 msgstr ""
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1340
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1348
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1367
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Возможные действия для ключа %s:"
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1371
 msgid "Current allowed actions: "
 msgstr "Допустимы действия:"
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1376
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Переключить возможность использования для подписи\n"
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1379
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Переключить возможность использования для шифрования\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1382
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Переключить возможность использования для аутентификации\n"
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1385
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Завершено\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1441
 msgid "Please select what kind of key you want:\n"
 msgstr "Выберите тип ключа:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1443
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA и ElGamal (по умолчанию)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (только для подписи)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1446
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (с требуемыми возможностями)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1448
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (только для шифрования)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (только для подписи)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (только для шифрования)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1453
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (с требуемыми возможностями)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1522
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Пара ключей DSA будет иметь длину %u бит.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1532
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "ключи %s могут иметь длину от %u до %u бит.\n"
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1539
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Какой размер ключа Вам необходим? (%u) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1553
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "размер ключей %s должен быть в пределах %u-%u\n"
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1559
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Запрашиваемый размер ключа %u бит\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1564 g10/keygen.c:1569
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "округлен до %u бит\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1618
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3893,7 +3898,7 @@ msgstr ""
 "      <n>m = срок действительности n месяцев\n"
 "      <n>y = срок действительности n лет\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1629
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3909,38 +3914,38 @@ msgstr ""
 "      <n>m = срок действительности подписи n месяцев\n"
 "      <n>y = срок действительности подписи n лет\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Key is valid for? (0) "
 msgstr "Ключ действителен до? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1655
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Подпись действительна до? (%s) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1673
 msgid "invalid value\n"
 msgstr "недопустимое значение\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1680
 msgid "Key does not expire at all\n"
 msgstr "Ключ не имеет ограничения срока действительности\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Signature does not expire at all\n"
 msgstr "Подпись не имеет ограничения срока действительности\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1686
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Ключ действителен до: %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1687
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Подпись действительна до %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1693
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3948,11 +3953,11 @@ msgstr ""
 "Ваша система не может корректно отображать даты после 2038.\n"
 "Однако, корректно обрабатываются даты до 2106.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1698
 msgid "Is this correct? (y/N) "
 msgstr "Все верно? (y/N) "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1713
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3967,44 +3972,44 @@ msgstr ""
 "    \"Baba Yaga (pensioner) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1726
 msgid "Real name: "
 msgstr "Ваше настоящее имя: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Invalid character in name\n"
 msgstr "Недопустимый символ в Имени\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name may not start with a digit\n"
 msgstr "Имя не должно начинаться с цифры\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1738
 msgid "Name must be at least 5 characters long\n"
 msgstr "Имя не должно быть короче 5 символов\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1746
 msgid "Email address: "
 msgstr "Email-адрес: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1752
 msgid "Not a valid email address\n"
 msgstr "Неправильный e-mail адрес\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1760
 msgid "Comment: "
 msgstr "Комментарий: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1766
 msgid "Invalid character in comment\n"
 msgstr "Недопустимый символ в комментарии\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1789
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Используется таблица символов: `%s'.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1795
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4015,7 +4020,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1800
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Не вставляйте email-адрес в имя пользователя или комментарий\n"
 
@@ -4030,24 +4035,24 @@ msgstr "Не вставляйте email-адрес в имя пользоват�
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1826
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (Q)Выход? "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (O)Принять/(Q)Выход? "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:1846
 msgid "Please correct the error first\n"
 msgstr "Сначала исправьте ошибку\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1886
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4055,12 +4060,12 @@ msgstr ""
 "Для защиты секретного ключа необходим пароль.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:1896 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1902
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4072,7 +4077,7 @@ msgstr ""
 "запустив данную программу с ключом \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:1924
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4084,50 +4089,50 @@ msgstr ""
 "обращения к дискам) в процессе генерации; это даст генератору\n"
 "случайных чисел возможность получить лучшую энтропию.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2722
 msgid "Key generation canceled.\n"
 msgstr "Создание ключа прервано.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:2921 g10/keygen.c:3068
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "сохранение открытого ключа в `%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:2923 g10/keygen.c:3071
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "сохранение заглушки секретного ключа в `%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:2926 g10/keygen.c:3074
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "сохранение секретного ключа в `%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3057
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3063
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "нет доступной для записи таблицы закрытых ключей: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3081
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "ошибка записи таблицы открытых ключей `%s': %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3088
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "ошибка записи таблицы секретных ключей `%s': %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3111
 msgid "public and secret key created and signed.\n"
 msgstr "открытый и закрытый ключи созданы и подписаны.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3122
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4135,45 +4140,45 @@ msgstr ""
 "Учтите, что данный ключ не может использоваться для шифрования.  Вы можете\n"
 "воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Сбой при создании ключа: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3197 g10/keygen.c:3326
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "ПРЕДУПРЕЖДАЮ: создание подключа для ключей v3 не совместимо с OpenPGP\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3236 g10/keygen.c:3359
 msgid "Really create? (y/N) "
 msgstr "Действительно создать? (y/N)"
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3524
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "сбой сохранения ключа на карту: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3571
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "не могу создать резервную копию, файл `%s': %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3597
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "ЗАМЕТЬТЕ: архивная копия ключа на карте сохранена в `%s'\n"
@@ -4454,208 +4459,212 @@ msgstr "ВНИМАНИЕ: невозможно обновить ключ %s с %
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ВНИМАНИЕ: невозможно обновить ключ %s с %s: %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:239
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "странный размер зашифрованного сеансового ключа (%d)\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "сеансовый ключ зашифрован %s \n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:300
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "пароль создан с незнакомой хеш-фкнкцией %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:381
 #, c-format
 msgid "public key is %s\n"
 msgstr "открытый ключ %s\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:438
 msgid "public key encrypted data: good DEK\n"
 msgstr "данные зашифрованы открытым ключом: правильный DEK\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:471
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "зашифровано %u-битным ключом %s, с ID %s, созданным %s\n"
 
-#: g10/mainproc.c:476 g10/pkclist.c:219
+#: g10/mainproc.c:475 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:479
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "зашифровано ключом %s с ID %s\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:493
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "сбой расшифрования с открытым ключом: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:507
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "зашифровано с %lu паролями\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:509
 msgid "encrypted with 1 passphrase\n"
 msgstr "зашифровано с 1 паролем\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:540 g10/mainproc.c:562
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "принятие %s зашифрованных данных\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:548
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "шифр IDEA недоступен, попробуйте использовать взамен %s\n"
 
-#: g10/mainproc.c:581
+#: g10/mainproc.c:580
 msgid "decryption okay\n"
 msgstr "Расшифровано\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:584
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ВНИМАНИЕ: целостность сообщения не защищена\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:597
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ВНИМАНИЕ: зашифрованное сообщение было изменено!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:603
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "сбой расшифрования: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:624
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "ЗАМЕТЬТЕ: отправитель требует \"только для просмотра Вами\"\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:626
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "оригинальное имя файла='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:711
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr ""
+
+#: g10/mainproc.c:839
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "самостоятельный сертификат отзыва: \"gpg --import\" для применения\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1187
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Действительная подпись от \"%s\""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1430
 msgid "signature verification suppressed\n"
 msgstr "проверка подписи подавлена\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1539
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "не могу обработать эти множественные подписи\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1550
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Подпись сделана %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1551
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               ключом %s с ID %s\n"
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1555
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Подпись создана %s ключом %s с ID %s\n"
 
-#: g10/mainproc.c:1544
+#: g10/mainproc.c:1575
 msgid "Key available at: "
 msgstr "Ключ доступен на:"
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ПЛОХАЯ подпись от  \"%s\""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Просроченная подпись от \"%s\""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Действительная подпись от \"%s\""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr "[сомнительно]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1797
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1895
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Подпись просрочена %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1900
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Подпись действительна до %s\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1903
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s подпись, хэш-функция %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr "двоичный"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr "текстовый"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 msgid "unknown"
 msgstr "неизвестно"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Не могу проверить подпись: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
 msgstr "не отделенная подпись\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:2037
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "ВНИМАНИЕ: обнаружено множество подписей.  Только первая будет проверена.\n"
 
-#: g10/mainproc.c:2013
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "самостоятельная подпись класса 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr "старый (PGP 2.x) стиль подписи\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "обнаружен недопустимый корневой пакет в proc_tree()\n"
 
@@ -4793,18 +4802,18 @@ msgstr "ВНИМАНИЕ: параметры в `%s' еще не активны
 msgid "directory `%s' created\n"
 msgstr "создан каталог `%s'\n"
 
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:143
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "не могу использовать алгоритм с открытым ключом %d\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:713
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "ВНИМАНИЕ: потенциально небезопасный сеансовый ключ, зашифрованный "
 "симметричным шифром\n"
 
-#: g10/parse-packet.c:1159
+#: g10/parse-packet.c:1164
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "подпакет типа %d имеет выставленный критический бит\n"
@@ -5546,12 +5555,12 @@ msgstr ""
 "ВНИМАНИЕ: невозможно развернуть %% URL предпочитаемого сервера ключей "
 "(слишком длинно). Использую неразвернутым.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:346
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "сбой проверки созданной подписи: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:355
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s подпись от: \"%s\"\n"
@@ -5572,11 +5581,11 @@ msgstr ""
 msgid "signing:"
 msgstr "подпись:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1101
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "только прозрачная подпись доступна с PGP 2.x ключом в режиме --pgp2\n"
 
-#: g10/sign.c:1278
+#: g10/sign.c:1280
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "будет использовано %s шифрование\n"
diff --git a/po/sk.po b/po/sk.po
index 92456906d..16087ef9c 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: [email protected]\n"
-"POT-Creation-Date: 2006-12-04 15:05+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <[email protected]>\n"
 "Language-Team: Slovak <[email protected]>\n"
@@ -39,10 +39,10 @@ msgstr "zapisujem tajn� k��� do `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
+#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -75,9 +75,9 @@ msgstr "nem��em ��ta� `%s': %s\n"
 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:481 g10/gpg.c:1008 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
+#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
+#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
@@ -391,15 +391,15 @@ msgstr "tajn� k��� nie je dostupn�"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
+#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "nemo�no previes� v d�vkovom m�de\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
+#: g10/keygen.c:1456
 msgid "Your selection? "
 msgstr "V� v�ber? "
 
@@ -577,8 +577,8 @@ msgstr "   (%d) RSA (len na �ifrovanie)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
+#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�ber.\n"
 
@@ -602,7 +602,7 @@ msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 msgid "secret key already stored on a card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1319 g10/keyedit.c:1351
 msgid "quit this menu"
 msgstr "ukon�i� toto menu"
 
@@ -611,7 +611,7 @@ msgstr "ukon�i� toto menu"
 msgid "show admin commands"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1322 g10/keyedit.c:1354
 msgid "show this help"
 msgstr "uk�za� t�to pomoc"
 
@@ -668,7 +668,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1457 g10/keyedit.c:1617
 msgid "Command> "
 msgstr "Pr�kaz> "
 
@@ -687,7 +687,7 @@ msgstr "konfliktn� pr�kazy\n"
 msgid "Admin commands are not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1602 g10/keyedit.c:2238
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 
@@ -742,7 +742,7 @@ msgstr "Opakujte heslo: "
 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:3868 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -752,7 +752,7 @@ msgstr "nemo�no otvori� `%s'\n"
 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:3392 g10/keyserver.c:1705
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3386 g10/keyserver.c:1705
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -801,7 +801,7 @@ msgstr "existuje tajn� k��� pre tento verejn� k��� \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "aby ste ho zmazali, pou�ite najprv prep�na� \"--delete-secret-key\".\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:213 g10/sign.c:1286
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
@@ -871,12 +871,12 @@ msgstr ""
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s za�ifrovan� pre: %s\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:292
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s za�ifrovan� d�ta\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:296
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
@@ -1019,7 +1019,7 @@ msgstr "VAROVANIE: tajn� k��� %08lX nem� jednoduch� SK kontroln� s��et\n"
 msgid "WARNING: nothing exported\n"
 msgstr "VAROVANIE: ni� nebolo vyexportovan�\n"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:379
 msgid ""
 "@Commands:\n"
 " "
@@ -1027,128 +1027,128 @@ msgstr ""
 "@Pr�kazy:\n"
 " "
 
-#: g10/gpg.c:380
+#: g10/gpg.c:381
 msgid "|[file]|make a signature"
 msgstr "|[s�bor]|vytvori� podpis"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "|[file]|make a clear text signature"
 msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:383
 msgid "make a detached signature"
 msgstr "vytvori� podpis oddelen� od dokumentu"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "encrypt data"
 msgstr "�ifrova� d�ta"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrovanie len so symetrickou �ifrou"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "decrypt data (default)"
 msgstr "de�ifrova� d�ta (implicitne)"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "verify a signature"
 msgstr "verifikova� podpis"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "list keys"
 msgstr "vyp�sa� zoznam k���ov"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:394
 msgid "list keys and signatures"
 msgstr "vyp�sa� zoznam k���ov a podpisov"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "skontrolova� podpisy k���ov"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "list keys and fingerprints"
 msgstr "vyp�sa� zoznam k���ov a fingerprintov"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "list secret keys"
 msgstr "vyp�sa� zoznam tajn�ch k���ov"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "generate a new key pair"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "remove keys from the public keyring"
 msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "remove keys from the secret keyring"
 msgstr "odstr�ni� k��� zo s�boru tajn�ch k���ov"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "sign a key"
 msgstr "podp�sa� k���"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "sign a key locally"
 msgstr "podp�sa� k��� lok�lne"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:404
 msgid "sign or edit a key"
 msgstr "podp�sa� alebo modifikova� k���"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "generate a revocation certificate"
 msgstr "vytvori� revoka�n� certifik�t"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "export keys"
 msgstr "exportova� k���e"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:408
 msgid "export keys to a key server"
 msgstr "exportova� k���e na server k���ov"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:409
 msgid "import keys from a key server"
 msgstr "importova� k���e zo servera k���ov"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "search for keys on a key server"
 msgstr "vyh�ada� k���e na serveri k���ov"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:413
 msgid "update all keys from a keyserver"
 msgstr "aktualizova� v�etky k���e zo servera k���ov"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:417
 msgid "import/merge keys"
 msgstr "importova�/zl��i� k���e"
 
-#: g10/gpg.c:419
+#: g10/gpg.c:420
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:421
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:422
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "update the trust database"
 msgstr "aktualizova� datab�zu d�very"
 
-#: g10/gpg.c:437
+#: g10/gpg.c:438
 msgid "|algo [files]|print message digests"
 msgstr "|algo [s�bory]|vyp�� hash"
 
-#: g10/gpg.c:441 g10/gpgv.c:71
+#: g10/gpg.c:442 g10/gpgv.c:70
 msgid ""
 "@\n"
 "Options:\n"
@@ -1158,55 +1158,55 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "create ascii armored output"
 msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
 
-#: g10/gpg.c:445
+#: g10/gpg.c:446
 msgid "|NAME|encrypt for NAME"
 msgstr "|MENO|�ifrova� pre MENO"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 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:457
+#: g10/gpg.c:458
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavi� �rove� komprim�cie N (0 - �iadna\n"
 " komprim�cia)"
 
-#: g10/gpg.c:462
+#: g10/gpg.c:463
 msgid "use canonical text mode"
 msgstr "pou�i� k�nonick� textov� m�d"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:477
 msgid "use as output file"
 msgstr "pou�i� ako v�stupn� s�bor"
 
-#: g10/gpg.c:478 g10/gpgv.c:73
+#: g10/gpg.c:479 g10/gpgv.c:72
 msgid "verbose"
 msgstr "s dodato�n�mi inform�ciami"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "do not make any changes"
 msgstr "nevykona� �iadne zmeny"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:491
 msgid "prompt before overwriting"
 msgstr "vy�iada� potvrdenie pred prep�san�m"
 
-#: g10/gpg.c:531
+#: g10/gpg.c:532
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:532
+#: g10/gpg.c:533
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1215,7 +1215,7 @@ msgstr ""
 "(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
 "mo�nost�)\n"
 
-#: g10/gpg.c:564
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1235,17 +1235,17 @@ msgstr ""
 " --list-keys [men�]        vyp�sa� k���e\n"
 " --fingerprint [men�]      vyp�sa� fingerprinty\n"
 
-#: g10/gpg.c:763 g10/gpgv.c:98
+#: g10/gpg.c:766 g10/gpgv.c:97
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Chyby ozn�mte, pros�m, na adresu <[email protected]>.\n"
 "Pripomienky k prekladu <[email protected]>.\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:783
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1255,7 +1255,7 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: g10/gpg.c:794
+#: g10/gpg.c:797
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1263,586 +1263,591 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid "Pubkey: "
 msgstr "Verejn� k���e: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2310
+#: g10/gpg.c:806 g10/keyedit.c:2304
 msgid "Cipher: "
 msgstr "�ifry: "
 
-#: g10/gpg.c:809
+#: g10/gpg.c:812
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2356
+#: g10/gpg.c:818 g10/keyedit.c:2350
 msgid "Compression: "
 msgstr "Kompresia: "
 
-#: g10/gpg.c:898
+#: g10/gpg.c:901
 msgid "usage: gpg [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: g10/gpg.c:1046
+#: g10/gpg.c:1049
 msgid "conflicting commands\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1067
 #, 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:1261
+#: g10/gpg.c:1264
 #, 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:1264
+#: g10/gpg.c:1267
 #, 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:1267
+#: g10/gpg.c:1270
 #, 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:1273
+#: g10/gpg.c:1276
 #, 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:1276
+#: g10/gpg.c:1279
 #, 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:1279
+#: g10/gpg.c:1282
 #, 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:1285
+#: g10/gpg.c:1288
 #, 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:1288
+#: g10/gpg.c:1291
 #, 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:1291
+#: g10/gpg.c:1294
 #, 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:1297
+#: g10/gpg.c:1300
 #, 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:1300
+#: g10/gpg.c:1303
 #, 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:1303
+#: g10/gpg.c:1306
 #, 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:1444
+#: g10/gpg.c:1447
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 #, 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:1543
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "uk� v ktorom s�bore k���ov je vyp�san� k���"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, 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:1954
+#: g10/gpg.c:1957
 #, 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:1996
+#: g10/gpg.c:1999
 #, 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:2000
+#: g10/gpg.c:2003
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "s�bor s mo�nos�ami `%s': %s\n"
 
-#: g10/gpg.c:2007
+#: g10/gpg.c:2010
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, 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:2236
+#: g10/gpg.c:2239
 #, 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:2402 g10/gpg.c:2414
+#: g10/gpg.c:2405 g10/gpg.c:2417
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2494
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 #, 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:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "%s nie je platn� znakov� sada\n"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/gpg.c:2768
+#: g10/gpg.c:2773
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2771
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prep��e %s\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolen� pou��va� %s s %s!\n"
 
-#: g10/gpg.c:2858
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�va s %s zmysel!\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2875
 #, 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:2880
+#: g10/gpg.c:2890
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/gpg.c:2894
+#: g10/gpg.c:2904
 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:2900
+#: g10/gpg.c:2910
 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:2906
+#: g10/gpg.c:2916
 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:2919
+#: g10/gpg.c:2929
 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:2986 g10/gpg.c:3010
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2992 g10/gpg.c:3016
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2998
+#: g10/gpg.c:3008
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3004
+#: g10/gpg.c:3014
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3029
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3031
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3033
 #, 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:3025
+#: g10/gpg.c:3035
 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:3027
+#: g10/gpg.c:3037
 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:3030
+#: g10/gpg.c:3040
 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:3034
+#: g10/gpg.c:3044
 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:3041
+#: g10/gpg.c:3051
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� predvo�by\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3060
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3064
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
 
-#: g10/gpg.c:3058
+#: g10/gpg.c:3068
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
 
-#: g10/gpg.c:3091
+#: g10/gpg.c:3101
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s e�te nepracuje s %s\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3148
 #, 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:3143
+#: g10/gpg.c:3153
 #, 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:3148
+#: g10/gpg.c:3158
 #, 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:3250
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3271
 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:3272
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [meno s�boru]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [meno s�boru]"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3291
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [meno s�boru]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3314
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3306
+#: g10/gpg.c:3316
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3319
 #, 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:3327
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [meno s�boru]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3365
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3367
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3370
 #, 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:3380
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [meno s�boru]"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [meno s�boru]"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [meno s�boru]"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key id u��vate�a"
 
-#: g10/gpg.c:3426
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u��vate�a"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u��vate�a [pr�kazy]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3528
 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:3560
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3572
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/gpg.c:3564
+#: g10/gpg.c:3574
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export k���a: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3585
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa n�js� server: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3595
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualiz�cia servera zlyhala: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3644
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3854
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[meno s�boru]"
 
-#: g10/gpg.c:3858
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite p�sa� svoju spr�vu ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4172
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4174
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4207
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
@@ -1869,42 +1874,42 @@ 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:2380 g10/keyedit.c:3712
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, 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:2611
+#: g10/getkey.c:2614
 #, 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:2658
+#: g10/getkey.c:2661
 #, 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"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:73
 msgid "be somewhat more quiet"
 msgstr "by� o trochu tich��"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "take the keys from this keyring"
 msgstr "Zmaza� tento k��� zo s�boru k���ov? "
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:76
 msgid "make timestamp conflicts only a warning"
 msgstr "konflikt �asov�ho raz�tka"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:77
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zap�sa� inform�cie o stave do tohto FD"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:101
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Pou�itie: gpgv [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:104
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2434,7 +2439,7 @@ msgstr "k��� %08lX: nov� k��� - presko�en�\n"
 msgid "no writable keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor k���ov (keyring): %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisujem do '%s'\n"
@@ -2796,42 +2801,42 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
+#: g10/keyedit.c:890 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Ste si ist�, �e st�le chcete podp�sa� tento k���? (a/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
+#: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  Nemo�no podp�sa�.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID u��vate�a \"%s\" nie je podp�san� n�m sam�m."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID u��vate�a \"%s\" nie je podp�san� n�m sam�m."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Skuto�ne podp�sa�? "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2840,11 +2845,11 @@ msgstr ""
 "Podpis k���a \"%s\" n�m sam�m je\n"
 "podpis vo form�te PGP 2.x.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Prajete si ho zmeni� na form�t OpenPGP? (a/N) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2854,11 +2859,11 @@ msgstr ""
 "je len lok�lny.\n"
 "\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Chcete, aby platnos� V�ho podpisu vypr�ala v rovnakom �ase? (A/n) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2868,54 +2873,54 @@ msgstr ""
 "je len lok�lny.\n"
 "\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Prajete si ho zmeni� na plne exportovate�n� podpis? (a/N) "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" je u� lok�lne podp�san� k���om %08lX\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" je u� podp�san� k���om %08lX\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Ste si ist�, �e st�le chcete podp�sa� tento k���? (a/N) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Ni� na podp�sanie k���om %08lX\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Platnos� k���a vypr�ala!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Platnos� k���a vypr�� %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Chcete, aby platnos� V�ho podpisu vypr�ala v rovnakom �ase? (A/n) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:883
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Nem��ete vytvori� OpenPGP podpis k���a typu PGP 2.x, ke� ste v --pgp2 m�de.\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:885
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "To by sp�sobilo nepou�itelnos� k���a v PGP 2.x.\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:910
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2925,32 +2930,32 @@ msgstr ""
 "patr� vy��ie uvedenej osobe?\n"
 "Pokia� nepozn�te odpove�, zadajte \"0\".\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Neodpoviem.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) V�bec som to nekontroloval(a).%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) �iasto�ne som to overil(a).%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ve�mi d�kladne som to overil(a).%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:927
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "V� v�ber? ('?' - viac inform�ci�): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:951
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2959,28 +2964,28 @@ msgstr ""
 "Ste si ist�, �e chcete podp�sa� tento k���\n"
 "svoj�m k���om: \""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:958
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ide o podpis k���a n�m sam�m\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "VAROVANIE: podpis nebude ozna�en� ako neexportovate�n�.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:972
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "VAROVANIE: podpis nebude ozna�en� ako neodvolate�n� (non-revocable).\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:982
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
@@ -2988,72 +2993,72 @@ msgstr ""
 "Podpis bude ozna�en� ako neexportovate�n�.\n"
 "\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:989
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Podpis bude ozna�en� ako neodvolate�n� (non-revocable).\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "V�bec som tento k��� neoveril.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1001
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "�iasto�ne som overil tento k���.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1006
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Velmi d�kladne som overil tento k���.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1016
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Skuto�ne podp�sa�? "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
-#: g10/keyedit.c:5004 g10/sign.c:352
+#: g10/keyedit.c:1061 g10/keyedit.c:4793 g10/keyedit.c:4884 g10/keyedit.c:4948
+#: g10/keyedit.c:5009 g10/sign.c:351
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1126
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1137 g10/keygen.c:3215
 msgid "This key is not protected.\n"
 msgstr "Tento k��� nie je chr�nen�.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1145 g10/keygen.c:3218
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1149 g10/keygen.c:3222
 msgid "Key is protected.\n"
 msgstr "k��� je chr�nen�.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1173
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nie je mo�n� editova� tento k���: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1179
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3061,11 +3066,11 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pre tento tajn� k���.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1188 g10/keygen.c:1895
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1193
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3073,206 +3078,206 @@ msgstr ""
 "Nechcete heslo - to je *zl�* n�pad!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1196
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Skuto�ne to chcete urobi�? "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1267
 msgid "moving a key signature to the correct place\n"
 msgstr "pres�vam podpis k���a na spr�vne miesto\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1353
 msgid "save and quit"
 msgstr "ulo�i� a ukon�i�"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1356
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "vyp�sa� fingerprint"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1357
 msgid "list key and user IDs"
 msgstr "vyp�sa� zoznam k���ov a id u��vate�ov"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1359
 msgid "select user ID N"
 msgstr "vyberte identifik�tor u��vate�a N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1360
 #, fuzzy
 msgid "select subkey N"
 msgstr "vyberte identifik�tor u��vate�a N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1361
 #, fuzzy
 msgid "check signatures"
 msgstr "revokova� podpisy"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1366
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "podp�sa� k��� lok�lne"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1379
 msgid "add a user ID"
 msgstr "prida� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1381
 msgid "add a photo ID"
 msgstr "prida� fotografick� ID"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1383
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "zmaza� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1388
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1392
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1394
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1396
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "zmaza� sekund�rny k���"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1402
 msgid "add a revocation key"
 msgstr "prida� revoka�n� k���"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nem��ete zmeni� dobu platnosti k���a verzie 3\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "ozna�i� u��vate�sk� ID ako prim�rne"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "prepn�� medzi vyp�san�m zoznamu tajn�ch a verejn�ch k���ov"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1413
 msgid "list preferences (expert)"
 msgstr "vyp�sa� zoznam predvolieb (pre expertov)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1415
 msgid "list preferences (verbose)"
 msgstr "vyp�sa� zoznam predvolieb (podrobne)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "zmeni� heslo"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revokova� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revokova� sekund�rny k���"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "nastavi� k��� ako platn� (enable)"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "nastavi� k��� ako neplatn� (disable)"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "uk�za� fotografick� ID"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1446
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1564
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "chyba pri ��tan� bloku tajn�ho k���a `%s': %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1582
 msgid "Secret key is available.\n"
 msgstr "Tajn� k��� je dostupn�.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1663
 msgid "Need the secret key to do this.\n"
 msgstr "Na vykonanie tejto oper�cie je potrebn� tajn� k���.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1671
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Pros�m, najsk�r pou�ite pr�kaz \"toggle\" (prepn��).\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1690
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3280,241 +3285,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1730
 msgid "Key is revoked."
 msgstr "K��� revokovan�."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1749
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Skuto�ne podp�sa� v�etky id u��vate�a? "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1756
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1765
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nezn�ma trieda podpisu"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1788
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tento pr�kaz nie je v m�doch %s dovolen�.\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
 msgid "You must select at least one user ID.\n"
 msgstr "Mus�te vybra� aspo� jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1812
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem��ete zmaza� posledn� id u��vate�a!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1814
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Skuto�ne odstr�ni� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1815
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1865
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1877
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Mus�te vybra� aspo� jeden k���.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1905
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1919
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1960
 msgid "You must select at least one key.\n"
 msgstr "Mus�te vybra� aspo� jeden k���.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1963
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Skuto�ne chcete zmaza� vybran� k���e? "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1964
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Skuto�ne chcete zmaza� tento k���? "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:1999
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2000
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Skuto�ne revokova� toto id u��vate�a? "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2018
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Skuto�ne chcete revokova� tento k���? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2029
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Skuto�ne chcete revokova� vybran� k���e? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Skuto�ne chcete revokova� tento k���? "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2081
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2123
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "nastavi� zoznam predvolieb"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2129
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Skuto�ne aktualizova� predvo�by? "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2199
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Ulo�i� zmeny? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2202
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�i� bez ulo�enia? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2212
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2226
 msgid "Key not changed so no update needed.\n"
 msgstr "k��� nebol zmenen�, tak�e nie je potrebn� ho aktualizova�.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2327
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2379
 msgid "Features: "
 msgstr "Charakteristiky: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2390
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2405 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2413 g10/keyedit.c:2414
 #, fuzzy
 msgid "Notations: "
 msgstr "Not�cie: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2624
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "U��vate�sk� ID vo form�te PGP 2.x nem� �iadne predvo�by\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2683
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Tento k��� m��e by� revokovan� k���om %s "
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2704
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tento k��� m��e by� revokovan� k���om %s "
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2710
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(citliv� inform�cia)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keyedit.c:2726 g10/keyedit.c:2782 g10/keyedit.c:2843 g10/keyedit.c:2858
 #: g10/keylist.c:194 g10/keyserver.c:511
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2729 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2731 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2733 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2735
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2754
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2761
 msgid "This key has been disabled"
 msgstr "Tento k��� bol ozna�en� za neplatn� (disabled)"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2789 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2813
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3522,19 +3527,19 @@ 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:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2944
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3542,7 +3547,7 @@ msgstr ""
 "VAROVANIE: �iadne ID u��vate�a nebolo ozna�en� ako prim�rne. Tento pr�kaz\n"
 "sp�sob�, �e in� ID u��vate�a sa bude pova�ova� prim�rne.\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3005
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3551,75 +3556,75 @@ msgstr ""
 "VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
 "           verzi�ch PGP vies� k odmietnutiu tohto k���a.\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3351
+#: g10/keyedit.c:3010 g10/keyedit.c:3345
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete st�le prida�? (a/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3016
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nemali by ste prid�va� fotografick� ID k PGP2 k���u.\n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3156
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Zmaza� tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3166
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Zmaza� tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3170
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Zmaza� tento nezn�my podpis? (a/N/u)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3176
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Skuto�ne zmaza� tento podpis podp�san� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3190
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Zmazan� %d podpis.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3191
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Zmazan�ch %d podpisov.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3194
 msgid "Nothing deleted.\n"
 msgstr "Ni� nebolo zmaznan�.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3227 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "neplatn� sp�sob reprezent�cie v ASCII"
 
-#: g10/keyedit.c:3235
+#: g10/keyedit.c:3229
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:3242
+#: g10/keyedit.c:3236
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3237
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3246
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3340
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3628,370 +3633,370 @@ msgstr ""
 "VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
 "           verzi�ch PGP vies� k odmietnutiu tohoto k���a.\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3351
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nemali by ste prid�va� fotografick� ID k PGP2 k���u.\n"
 
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3371
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u��vate�a poveren�ho revok�ciou: "
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3396
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "k��� vo form�te PGP 2.x nemo�no poveri� revok�ciou\n"
 
-#: g10/keyedit.c:3417
+#: g10/keyedit.c:3411
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "k��� nemo�no poveri� revok�ciou n�m sam�m\n"
 
-#: g10/keyedit.c:3439
+#: g10/keyedit.c:3433
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "VAROVANIE: Tento k��� bol revokovan� jeho ur�en�m revok�torom/!\n"
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3452
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VAROVANIE: ozna�enie k���a ako revokovac� u� nem��e by� zru�en�!\n"
 
-#: g10/keyedit.c:3464
+#: g10/keyedit.c:3458
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Ste si ist�, �e chcete ozna�i� tento k��� ako revokovac�? (a/N): "
 
-#: g10/keyedit.c:3525
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Pros�m, odstr��te v�ber z tajn�ch k���ov.\n"
 
-#: g10/keyedit.c:3531
+#: g10/keyedit.c:3526
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Pros�m, vyberte najviac jeden sekund�rny k���.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3530
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Men�m dobu platnosti sekund�rneho k���a.\n"
 
-#: g10/keyedit.c:3538
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Men�m dobu platnosti prim�rneho k���a.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3582
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nem��ete zmeni� dobu platnosti k���a verzie 3\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3598
 msgid "No corresponding signature in secret ring\n"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3678
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROVANIE: podpisovac� podk��� %08lX nie je kr��ovo certifikovan�\n"
 
-#: g10/keyedit.c:3679
+#: g10/keyedit.c:3684
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3841
+#: g10/keyedit.c:3846
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�ve jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
+#: g10/keyedit.c:3885 g10/keyedit.c:3995 g10/keyedit.c:4115 g10/keyedit.c:4256
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "presko�en� v3 podpis k���a n�m sam�m u u��vate�sk�ho id \"%s\"\n"
 
-#: g10/keyedit.c:4051
+#: g10/keyedit.c:4056
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4131
+#: g10/keyedit.c:4136
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
 
-#: g10/keyedit.c:4132
+#: g10/keyedit.c:4137
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4199
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Podpisov� not�cia: "
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4348
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Prep�sa� (a/N)? "
 
-#: g10/keyedit.c:4407
+#: g10/keyedit.c:4412
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4470
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4492
+#: g10/keyedit.c:4497
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4627
+#: g10/keyedit.c:4632
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u��vate�a: \""
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4635 g10/keyedit.c:4699 g10/keyedit.c:4742
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   podp�san� %08lX v %s%s%s\n"
 
-#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 msgid " (non-exportable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4641
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnos� podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:4640
+#: g10/keyedit.c:4645
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete st�le revokova�? (a/N) "
 
-#: g10/keyedit.c:4644
+#: g10/keyedit.c:4649
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? (a/N)"
 
-#: g10/keyedit.c:4671
+#: g10/keyedit.c:4676
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Podp�sali ste nasleduj�ce identifik�tory u��vate�a:\n"
 
-#: g10/keyedit.c:4697
+#: g10/keyedit.c:4702
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4709
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokovan� %08lX v %s\n"
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4731
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te sa revokova� tieto podpisy:\n"
 
-#: g10/keyedit.c:4746
+#: g10/keyedit.c:4751
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Skuto�ne vytvori� revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4781
 msgid "no secret key\n"
 msgstr "neexistuje tajn� k���\n"
 
-#: g10/keyedit.c:4846
+#: g10/keyedit.c:4851
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:4863
+#: g10/keyedit.c:4868
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "VAROVANIE: podpis pou�ivate�k�ho ID vznikol %d sekund v bud�cnosti\n"
 
-#: g10/keyedit.c:4927
+#: g10/keyedit.c:4932
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:4989
+#: g10/keyedit.c:4994
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:5084
+#: g10/keyedit.c:5089
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Zobrazujem %s fotografick� ID s ve�kos�ou %ld pre k��� 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "duplicita predvo�by %c%lu\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "pr�li� ve�a `%c' predvolieb\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "pr�li� ve�a `%c' predvolieb\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "pr�li� ve�a `%c' predvolieb\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:876
 msgid "writing direct signature\n"
 msgstr "zapisujem podpis k���a n�m sam�m (direct signature)\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:915
 msgid "writing self signature\n"
 msgstr "zapisujem podpis k���a sebou sam�m\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:965
 msgid "writing key binding signature\n"
 msgstr "zapisujem \"key-binding\" podpis\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
+#: g10/keygen.c:2776
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatn� d�ka k���a; pou�ijem %u bitov\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�ka k���a zaokr�hlen� na %u bitov\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1331
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1334
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1337
 #, fuzzy
 msgid "Encrypt"
 msgstr "�ifrova� d�ta"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1340
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1348
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1367
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1371
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1376
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1379
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1382
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1385
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1441
 msgid "Please select what kind of key you want:\n"
 msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1443
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (len na podpis)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1448
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (len na podpis)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1453
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1522
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "P�r k���ov DSA bude ma� d�ku 1024 bitov.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1532
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1539
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Ak� ve�kos� k���a si prajete? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1553
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1559
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Po�adovan� d�ka k���a je %u bitov.\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1564 g10/keygen.c:1569
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�hlen� na %u bitov\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1618
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4007,7 +4012,7 @@ msgstr ""
 "      <n>m = doba platnosti k���a skon�� za n mesiacov\n"
 "      <n>y = doba platnosti k���a skon�� za n rokov\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1629
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4023,40 +4028,40 @@ msgstr ""
 "      <n>m = doba platnosti podpisu skon�� za n mesiacov\n"
 "      <n>y = doba platnosti podpisu skon�� za n rokov\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Key is valid for? (0) "
 msgstr "K��� je platn� na? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platn� na? (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1673
 msgid "invalid value\n"
 msgstr "neplatn� hodnota\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1680
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "platnos� %s neskon��\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "platnos� %s neskon��\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1686
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "platnos� %s skon�� %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1687
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnos� podpisu vypr�� %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1693
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4064,12 +4069,12 @@ msgstr ""
 "V� syst�m nevie zobrazi� d�tumy po roku 2038.\n"
 "V ka�dom pr�pade bud� d�tumy korektne spracov�van� do roku 2106.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1698
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Je to spr�vne (a/n)? "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1713
 #, fuzzy
 msgid ""
 "\n"
@@ -4086,44 +4091,44 @@ msgstr ""
 "    \"Jozko Mrkvicka (student) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1726
 msgid "Real name: "
 msgstr "Meno a priezvisko: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Invalid character in name\n"
 msgstr "Neplatn� znak ve mene\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name may not start with a digit\n"
 msgstr "Meno nem��e za��na� ��slicou\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1738
 msgid "Name must be at least 5 characters long\n"
 msgstr "Meno mus� by� dlh� aspo� 5 znakov\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1746
 msgid "Email address: "
 msgstr "E-mailov� adresa: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1752
 msgid "Not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1760
 msgid "Comment: "
 msgstr "Koment�r: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1766
 msgid "Invalid character in comment\n"
 msgstr "Neplatn� znak v koment�ri\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1789
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou��vate znakov� sadu `%s'.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1795
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4134,7 +4139,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1800
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Do po�a meno alebo koment�r nep��te, pros�m, e-mailov� adresu.\n"
 
@@ -4149,23 +4154,23 @@ msgstr "Do po�a meno alebo koment�r nep��te, pros�m, e-mailov� adresu.\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 msgid "NnCcEeOoQq"
 msgstr "mMkKeEPpUu"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1826
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (U)kon�i�? "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (P)okra�ova�/(U)kon�i�? "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:1846
 msgid "Please correct the error first\n"
 msgstr "Najsk�r, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1886
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4173,12 +4178,12 @@ msgstr ""
 "Na ochranu V�ho tajn�ho k���a mus�te zada� heslo.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:1896 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1902
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4190,7 +4195,7 @@ msgstr ""
 "tohto programu s parametrom \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:1924
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4202,50 +4207,50 @@ msgstr ""
 "pou��va� disky); v�aka tomu m� gener�tor lep�iu �ancu z�ska� dostatok "
 "entropie.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2722
 msgid "Key generation canceled.\n"
 msgstr "Vytv�ranie k���a bolo zru�en�.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:2921 g10/keygen.c:3068
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisujem verejn� k��� do `%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:2923 g10/keygen.c:3071
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:2926 g10/keygen.c:3074
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3057
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor verejn�ch k���ov (pubring): %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3063
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor tajn�ch k���ov (secring): %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3081
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "chyba pri z�pise do s�boru verejn�ch k���ov `%s': %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3088
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3111
 msgid "public and secret key created and signed.\n"
 msgstr "verejn� a tajn� k��� boli vytvoren� a podp�san�.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3122
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4254,12 +4259,12 @@ msgstr ""
 "Tento k��� nem��e by� pou�it� na �ifrovanie. Pre vytvorenie\n"
 "sekund�rneho k���a na tento ��el m��ete pou�i� pr�kaz \"--edit-key\".\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4267,7 +4272,7 @@ msgstr ""
 "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
 "je probl�m so syst�mov�m �asom)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4275,26 +4280,26 @@ msgstr ""
 "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
 "je probl�m so syst�mov�m �asom)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3197 g10/keygen.c:3326
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "POZN�MKA: vytvorenie podk���a pre k���e v3 nie je v s�lade s OpenPGP\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3236 g10/keygen.c:3359
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Skuto�ne vytvori�? "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3524
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3571
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3597
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "POZN�MKA: platnos� tajn�ho k���a %08lX skon�ila %s\n"
@@ -4579,214 +4584,218 @@ msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:239
 #, 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:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s k��� �ifrovan�ho sedenia\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:300
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:381
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "verejn� k��� je %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:438
 msgid "public key encrypted data: good DEK\n"
 msgstr "d�ta za�ifrovan� verejn�m k���om: spr�vny DEK\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:471
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:475 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:480
+#: g10/mainproc.c:479
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "za�ifrovan� %s k���om, ID %08lX\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:493
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "de�ifrovanie verejn�m k���om zlyhalo: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:507
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "za�ifrovan� s %lu heslami\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:509
 msgid "encrypted with 1 passphrase\n"
 msgstr "za�ifrovan� jedn�m heslom\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:540 g10/mainproc.c:562
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "predpoklad�m %s �ifrovan�ch d�t\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:548
 #, 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:581
+#: g10/mainproc.c:580
 msgid "decryption okay\n"
 msgstr "de�ifrovanie o.k.\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:584
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROVANIE: spr�va nem� ochranu integrity\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:597
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROVANIE: so za�ifrovanou spr�vou bolo manipulovan�!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:603
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:624
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "POZN�MKA: odosielate� po�adoval (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:626
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "p�vodn� meno s�boru='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:711
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr ""
+
+#: g10/mainproc.c:839
 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:1165
+#: g10/mainproc.c:1187
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Dobr� podpis od \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1430
 msgid "signature verification suppressed\n"
 msgstr "verifik�cia podpisu potla�en�\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1539
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neviem pracova� s t�mito n�sobn�mi podpismi\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1550
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1551
 #, 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:1524
+#: g10/mainproc.c:1555
 #, 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:1544
+#: g10/mainproc.c:1575
 msgid "Key available at: "
 msgstr "K��� k dispoz�cii na: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ZL� podpis od \""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypr�anou platnos�ou od \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobr� podpis od \""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr "[neist�]  "
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1797
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1895
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1900
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnos� podpisu vypr�� %s\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1903
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr "bin�rne"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr "textov� m�d"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 msgid "unknown"
 msgstr "nezn�me"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem��em overi� podpis: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
 msgstr "toto nie je podpis oddelen� od dokumentu\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:2037
 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:2013
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatn� podpis triedy 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis star�ho typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "n�jden� neplatn� kore�ov� paket v proc_tree()\n"
 
@@ -4922,17 +4931,17 @@ msgstr "VAROVANIE: nastavenie v `%s' e�te nie je akt�vne\n"
 msgid "directory `%s' created\n"
 msgstr "%s: adres�r vytvoren�\n"
 
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:143
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nem��em pracova� s algoritmom verejn�ho k���a %d\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:713
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "VAROVANIE: pravdepodobne nebezpe�n� symetricky �ifrovan� k��� sedenia\n"
 
-#: g10/parse-packet.c:1159
+#: g10/parse-packet.c:1164
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
@@ -5686,12 +5695,12 @@ msgstr ""
 "VAROVANIE: nem��em %%-expandova� URL politiky (pr�li� dlh�). Pou�it� "
 "neexpandovan�.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:346
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:355
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s podpis od: \"%s\"\n"
@@ -5712,13 +5721,13 @@ msgstr ""
 msgid "signing:"
 msgstr "podpisujem:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1101
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytv�ra� �itate�n� podpisy len s k���mi form�tu PGP-2."
 "x\n"
 
-#: g10/sign.c:1278
+#: g10/sign.c:1280
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�it� �ifrovanie %s\n"
diff --git a/po/sv.po b/po/sv.po
index 3ba720d27..b0b7f0d62 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-02-26 15:57+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2007-02-22 00:33+0100\n"
 "Last-Translator: Daniel Nylander <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -59,7 +59,7 @@ msgstr "väntar på lås på \"%s\"...\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3514 g10/import.c:195 g10/keygen.c:2392
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
 #: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
 #: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -740,7 +740,7 @@ msgid "PIN not correctly repeated; try again"
 msgstr "PIN-kod repeterades inte korrekt; försök igen"
 
 # se förra kommentaren
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3879 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -1424,7 +1424,7 @@ msgstr "inställningsfil \"%s\": %s\n"
 msgid "reading options from `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2864 g10/gpg.c:2883
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "OBS: %s är inte för normal användning!\n"
@@ -1445,7 +1445,7 @@ msgstr "\"%s\" är inte ett giltigt utgångsdatum för en signatur\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "\"%s\" är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2705 g10/keyedit.c:4074
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka url till nyckelserver\n"
 
@@ -1518,322 +1518,327 @@ msgid "show revoked and expired user IDs in signature verification"
 msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
 
 #: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr "validera signaturer med PKA-data"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "öka tillit på signaturer med giltigt PKA-data"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2603
 msgid "invalid verify options\n"
 msgstr "ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunde inte ställa in exec-path till %s\n"
 
-#: g10/gpg.c:2771
+#: g10/gpg.c:2773
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
 
-#: g10/gpg.c:2774
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr "ogiltig auto-key-locate-lista\n"
 
 # Programmet skapar en avbildning (image) av minnet för att lättare kunna spåra fel.
-#: g10/gpg.c:2853
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
 
-#: g10/gpg.c:2857
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/gpg.c:2869
+#: g10/gpg.c:2868
 #, 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:2876
+#: g10/gpg.c:2875
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "OBSERVERA: %s är inte tillgänglig i den här versionen\n"
 
-#: g10/gpg.c:2891
+#: g10/gpg.c:2890
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kommer inte att köra med osäkert minne på grund av %s\n"
 
-#: g10/gpg.c:2905
+#: g10/gpg.c:2904
 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:2911
+#: g10/gpg.c:2910
 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:2917
+#: g10/gpg.c:2916
 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:2930
+#: g10/gpg.c:2929
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "kryptering av meddelanden i --pgp2-läge kräver IDEA-chiffret\n"
 
-#: g10/gpg.c:2997 g10/gpg.c:3021
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen är ogiltig\n"
 
-#: g10/gpg.c:3003 g10/gpg.c:3027
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "vald sammandragsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3009
+#: g10/gpg.c:3008
 msgid "selected compression algorithm is invalid\n"
 msgstr "vald komprimeringsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3014
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vald algoritm för certifieringssammandrag ä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:3030
+#: g10/gpg.c:3029
 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:3032
+#: g10/gpg.c:3031
 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:3034
+#: g10/gpg.c:3033
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth måste vara inom intervallet från 1 till 255\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:3036
+#: g10/gpg.c:3035
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "ogiltigt 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:3038
+#: g10/gpg.c:3037
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ogiltigt minimivärde för certifieringsnivån; måste vara 1, 2 eller 3\n"
 
 # S2K har med krypteringen av hemliga nyckeln att göra
-#: g10/gpg.c:3041
+#: g10/gpg.c:3040
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3044
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ogiltigt S2K-läge; måste vara 0, 1 eller 3\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3051
 msgid "invalid default preferences\n"
 msgstr "ogiltiga 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:3061
+#: g10/gpg.c:3060
 msgid "invalid personal cipher preferences\n"
 msgstr "ogiltig inställning av föredragna krypteringsalgoritmer\n"
 
-#: g10/gpg.c:3065
+#: g10/gpg.c:3064
 msgid "invalid personal digest preferences\n"
 msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
 
-#: g10/gpg.c:3069
+#: g10/gpg.c:3068
 msgid "invalid personal compress preferences\n"
 msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
 
-#: g10/gpg.c:3102
+#: g10/gpg.c:3101
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/gpg.c:3149
+#: g10/gpg.c:3148
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "du får inte använda chifferalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:3154
+#: g10/gpg.c:3153
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "du får inte använda sammandragsalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3158
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "du får inte använda komprimeringsalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3271
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VARNING: mottagare (-r) angivna utan att använda publik nyckel-kryptering\n"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/gpg.c:3290
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3291
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av \"%s\" misslyckades: %s\n"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3314
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnamn]"
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3316
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "du kan inte använda --symmetric --encrypt med --s2k-mode 0\n"
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3319
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "du kan inte använda --symmetric --encrypt i %s-läget\n"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/gpg.c:3351
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3366
+#: g10/gpg.c:3365
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3367
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "du kan inte använda --symmetric --sign --encrypt med --s2k-mode 0\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3370
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "du kan inte använda --symmetric --sign --encrypt när du är i %s-läget\n"
 
-#: g10/gpg.c:3391
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/gpg.c:3425
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [användaridentitet] [nyckelring]"
 
-#: g10/gpg.c:3571
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3573
+#: g10/gpg.c:3572
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3574
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export av nyckeln misslyckades: %s\n"
 
-#: g10/gpg.c:3586
+#: g10/gpg.c:3585
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3595
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "uppdatering av nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/gpg.c:3655
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/gpg.c:3742
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/gpg.c:4173
+#: g10/gpg.c:4172
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
 
-#: g10/gpg.c:4175
+#: g10/gpg.c:4174
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
 
-#: g10/gpg.c:4208
+#: g10/gpg.c:4207
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
 
@@ -1857,17 +1862,17 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ogiltiga nyckeln %s tvingades till giltig med --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2380 g10/keyedit.c:3717
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ingen hemlig undernyckel för publika undernyckeln %s - hoppar över\n"
 
-#: g10/getkey.c:2611
+#: g10/getkey.c:2614
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "använder undernyckeln %s istället för primära nyckeln %s\n"
 
-#: g10/getkey.c:2658
+#: g10/getkey.c:2661
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "nyckel %s: hemlig nyckel utan publik nyckel - hoppades över\n"
@@ -3489,12 +3494,12 @@ msgstr ""
 "såvida inte du startar om programmet.\n"
 
 #: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
-#: g10/mainproc.c:1794 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "spärrad"
 
 #: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
-#: g10/mainproc.c:1796 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "utgånget"
 
@@ -4652,108 +4657,108 @@ msgstr "ingen signatur hittades\n"
 msgid "signature verification suppressed\n"
 msgstr "signaturvalidering utelämnad\n"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1539
 msgid "can't handle this ambiguous signature data\n"
 msgstr "kan inte hantera detta tvetydliga signaturdata\n"
 
-#: g10/mainproc.c:1541
+#: g10/mainproc.c:1550
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur gjord %s\n"
 
-#: g10/mainproc.c:1542
+#: g10/mainproc.c:1551
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "             med %s-nyckeln %s\n"
 
-#: g10/mainproc.c:1546
+#: g10/mainproc.c:1555
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatur gjordes %s med %s nyckel-id %s\n"
 
-#: g10/mainproc.c:1566
+#: g10/mainproc.c:1575
 msgid "Key available at: "
 msgstr "Nyckeln tillgänglig hos: "
 
-#: g10/mainproc.c:1699 g10/mainproc.c:1747
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FELAKTIG signatur från \"%s\""
 
-#: g10/mainproc.c:1701 g10/mainproc.c:1749
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utgången signatur från \"%s\""
 
-#: g10/mainproc.c:1703 g10/mainproc.c:1751
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekt signatur från \"%s\""
 
 # 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:1755
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr "[osäkert]"
 
-#: g10/mainproc.c:1787
+#: g10/mainproc.c:1797
 #, c-format
 msgid "                aka \"%s\""
 msgstr "      även känd som \"%s\""
 
-#: g10/mainproc.c:1885
+#: g10/mainproc.c:1895
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Giltighetstiden för signaturen har upphört %s\n"
 
-#: g10/mainproc.c:1890
+#: g10/mainproc.c:1900
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Giltighetstiden för signaturen går ut %s\n"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1903
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: g10/mainproc.c:1894
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr "binär"
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr "textläge"
 
-#: g10/mainproc.c:1895 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 msgid "unknown"
 msgstr "okänd"
 
-#: g10/mainproc.c:1915
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte kontrollera signaturen: %s\n"
 
-#: g10/mainproc.c:1984 g10/mainproc.c:2000 g10/mainproc.c:2086
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
 msgstr "detta är inte någon signatur i en separat fil\n"
 
-#: g10/mainproc.c:2027
+#: g10/mainproc.c:2037
 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:2035
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "fristående signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:2092
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ogiltigt rotpaket hittades i proc_tree()\n"
 
diff --git a/po/tr.po b/po/tr.po
index a4f36e1e7..0013e19fc 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: [email protected]\n"
-"POT-Creation-Date: 2006-12-04 15:05+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2005-03-16 07:30+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -41,10 +41,10 @@ msgstr "gizli anahtarı `%s'e yazıyor\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
+#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -77,9 +77,9 @@ 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:481 g10/gpg.c:1008 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
+#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
+#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "\"%s\" oluşturulamıyor: %s\n"
@@ -388,14 +388,14 @@ msgstr "OpenPGP anahtarı kullanılabilir değil: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "%s numaralı OpenPGP kartı saptandı\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
+#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "bu önceden betik kipinde yapılamaz\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
+#: g10/keygen.c:1456
 msgid "Your selection? "
 msgstr "Seçiminiz? "
 
@@ -561,8 +561,8 @@ msgstr "   (2) Şifreleme anahtarı\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Kimlik kanıtlama anahtarı\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
+#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
@@ -582,7 +582,7 @@ msgstr "anahtarın gizli parçaları kullanılabilir değil\n"
 msgid "secret key already stored on a card\n"
 msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1319 g10/keyedit.c:1351
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
@@ -590,7 +590,7 @@ msgstr "bu menüden çık"
 msgid "show admin commands"
 msgstr "yönetici komutlarını gösterir"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1322 g10/keyedit.c:1354
 msgid "show this help"
 msgstr "bunu gösterir"
 
@@ -642,7 +642,7 @@ msgstr "PIN değiştirmek için menü"
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1457 g10/keyedit.c:1617
 msgid "Command> "
 msgstr "Komut> "
 
@@ -658,7 +658,7 @@ msgstr "Yönetici komutlarına izin verilir\n"
 msgid "Admin commands are not allowed\n"
 msgstr "Yönetici komutlarına izin verilmez\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1602 g10/keyedit.c:2238
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 
@@ -715,7 +715,7 @@ msgstr "Bu PIN'i tekrarlayın: "
 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:3868 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -725,7 +725,7 @@ 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:3392 g10/keyserver.c:1705
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3386 g10/keyserver.c:1705
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -771,7 +771,7 @@ msgstr "genel anahtar \"%s\" için bir gizli anahtar var!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "onu önce \"--delete-secret-keys\" ile silmelisiniz.\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:213 g10/sign.c:1286
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "anahtar parolası oluşturulurken hata: %s\n"
@@ -844,12 +844,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:91 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:292
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s şifreli veri\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:296
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "bilinmeyen algoritma %d ile şifrelenmiş\n"
@@ -987,7 +987,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:378
+#: g10/gpg.c:379
 msgid ""
 "@Commands:\n"
 " "
@@ -995,127 +995,127 @@ msgstr ""
 "@Komutlar:\n"
 " "
 
-#: g10/gpg.c:380
+#: g10/gpg.c:381
 msgid "|[file]|make a signature"
 msgstr "|[dosya]|bir imza yapar"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosya]|açıkça okunabilen bir imza yapar"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:383
 msgid "make a detached signature"
 msgstr "bağımsız bir imza yapar"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "encrypt data"
 msgstr "veriyi şifreler"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "encryption only with symmetric cipher"
 msgstr "sadece simetrik şifre ile şifreler"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "decrypt data (default)"
 msgstr "veri şifresini açar (öntanımlı)"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "verify a signature"
 msgstr "bir imzayı doğrular"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "list keys"
 msgstr "anahtarları listeler"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:394
 msgid "list keys and signatures"
 msgstr "anahtarları ve imzaları listeler"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "list and check key signatures"
 msgstr "anahtar imzalarını listeler ve sınar"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "list keys and fingerprints"
 msgstr "anahtarları ve parmak izlerini listeler"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "list secret keys"
 msgstr "gizli anahtarları listeler"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "generate a new key pair"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "remove keys from the public keyring"
 msgstr "anahtarları genel anahtar zincirinden siler"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "remove keys from the secret keyring"
 msgstr "anahtarları gizli anahtar zincirinden siler"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "sign a key"
 msgstr "bir anahtarı imzalar"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "sign a key locally"
 msgstr "bir anahtarı yerel olarak imzalar"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:404
 msgid "sign or edit a key"
 msgstr "bir anahtarı düzenler ve imzalar"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "generate a revocation certificate"
 msgstr "bir yürürlükten kaldırma sertifikası üretir"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "export keys"
 msgstr "anahtarları gönderir"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:408
 msgid "export keys to a key server"
 msgstr "anahtarları bir anahtar sunucusuna gönderir"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:409
 msgid "import keys from a key server"
 msgstr "anahtarları bir anahtar sunucusundan indirir"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "search for keys on a key server"
 msgstr "bir anahtar sunucusunda anahtarları arar"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:413
 msgid "update all keys from a keyserver"
 msgstr "anahtarları bir anahtar sunucusundan günceller"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:417
 msgid "import/merge keys"
 msgstr "anahtarları indirir/katıştırır"
 
-#: g10/gpg.c:419
+#: g10/gpg.c:420
 msgid "print the card status"
 msgstr "kart durumunu basar"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:421
 msgid "change data on a card"
 msgstr "kart üzerindeki veriyi değiştirir"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:422
 msgid "change a card's PIN"
 msgstr "bir kartın PIN'ini değiştirir"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "update the trust database"
 msgstr "güvence veritabanını günceller"
 
-#: g10/gpg.c:437
+#: g10/gpg.c:438
 msgid "|algo [files]|print message digests"
 msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir"
 
-#: g10/gpg.c:441 g10/gpgv.c:71
+#: g10/gpg.c:442 g10/gpgv.c:70
 msgid ""
 "@\n"
 "Options:\n"
@@ -1125,51 +1125,51 @@ msgstr ""
 "Seçenekler:\n"
 " "
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluşturur"
 
-#: g10/gpg.c:445
+#: g10/gpg.c:446
 msgid "|NAME|encrypt for NAME"
 msgstr "|İSİM|İSİM için şifreleme yapar"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 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:457
+#: g10/gpg.c:458
 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:462
+#: g10/gpg.c:463
 msgid "use canonical text mode"
 msgstr "kurallı metin kipini kullanır"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:477
 msgid "use as output file"
 msgstr "çıktı dosyası olarak kullanılır"
 
-#: g10/gpg.c:478 g10/gpgv.c:73
+#: g10/gpg.c:479 g10/gpgv.c:72
 msgid "verbose"
 msgstr "çok detaylı"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "do not make any changes"
 msgstr "hiçbir değişiklik yapmaz"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:491
 msgid "prompt before overwriting"
 msgstr "üzerine yazmadan önce sorar"
 
-#: g10/gpg.c:531
+#: g10/gpg.c:532
 msgid "use strict OpenPGP behavior"
 msgstr "kesin OpenPGP davranışı etkin olur"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:533
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x uyumlu iletiler üretilir"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1177,7 +1177,7 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: g10/gpg.c:564
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1197,17 +1197,17 @@ msgstr ""
 " --list-keys [isimler]      anahtarları listeler\n"
 " --fingerprint [isimler]    parmak izlerini gösterir\n"
 
-#: g10/gpg.c:763 g10/gpgv.c:98
+#: g10/gpg.c:766 g10/gpgv.c:97
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Yazılım hatalarını lütfen <[email protected]> adresine,\n"
 "çeviri hatalarını ise <[email protected]> adresine bildiriniz.\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:783
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1217,7 +1217,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/gpg.c:794
+#: g10/gpg.c:797
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1225,567 +1225,572 @@ msgstr ""
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid "Pubkey: "
 msgstr "GenAnah: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2310
+#: g10/gpg.c:806 g10/keyedit.c:2304
 msgid "Cipher: "
 msgstr "Şifre: "
 
-#: g10/gpg.c:809
+#: g10/gpg.c:812
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2356
+#: g10/gpg.c:818 g10/keyedit.c:2350
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
-#: g10/gpg.c:898
+#: g10/gpg.c:901
 msgid "usage: gpg [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/gpg.c:1046
+#: g10/gpg.c:1049
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1067
 #, 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:1261
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizininde güvensiz iyelik\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, 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:1267
+#: g10/gpg.c:1270
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz iyelik\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1276
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "UYARI: UYARI: '%s' evdizininde güvensiz izinler\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, 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:1279
+#: g10/gpg.c:1282
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz izinler\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1288
 #, 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:1288
+#: g10/gpg.c:1291
 #, 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:1291
+#: g10/gpg.c:1294
 #, 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:1297
+#: g10/gpg.c:1300
 #, 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:1300
+#: g10/gpg.c:1303
 #, 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:1303
+#: g10/gpg.c:1306
 #, 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:1444
+#: g10/gpg.c:1447
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "listedeki bir anahtarın hangi anahtar zincirinde olduğunu gösterir"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/gpg.c:1954
+#: g10/gpg.c:1957
 #, 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:1996
+#: g10/gpg.c:1999
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
 
-#: g10/gpg.c:2000
+#: g10/gpg.c:2003
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: g10/gpg.c:2007
+#: g10/gpg.c:2010
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, 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:2236
+#: g10/gpg.c:2239
 #, 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:2402 g10/gpg.c:2414
+#: g10/gpg.c:2405 g10/gpg.c:2417
 #, 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:2491
+#: g10/gpg.c:2494
 #, 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:2515 g10/gpg.c:2702 g10/keyedit.c:4069
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 msgid "invalid keyserver options\n"
 msgstr "anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 msgid "invalid list options\n"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "'%s' geçerli bir karakter kümesi değil\n"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2603
 msgid "invalid verify options\n"
 msgstr "doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2610
 #, 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:2768
+#: g10/gpg.c:2773
 #, 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:2771
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/gpg.c:2858
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2875
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent bu oturumda kullanılamaz\n"
 
-#: g10/gpg.c:2880
+#: g10/gpg.c:2890
 #, 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:2894
+#: g10/gpg.c:2904
 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:2900
+#: g10/gpg.c:2910
 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:2906
+#: g10/gpg.c:2916
 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:2919
+#: g10/gpg.c:2929
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/gpg.c:2986 g10/gpg.c:3010
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:2992 g10/gpg.c:3016
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/gpg.c:2998
+#: g10/gpg.c:3008
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3004
+#: g10/gpg.c:3014
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3029
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3031
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3033
 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:3025
+#: g10/gpg.c:3035
 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:3027
+#: g10/gpg.c:3037
 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:3030
+#: g10/gpg.c:3040
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3044
 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:3041
+#: g10/gpg.c:3051
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3060
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3064
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özümleme tercihleri geçersiz\n"
 
-#: g10/gpg.c:3058
+#: g10/gpg.c:3068
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/gpg.c:3091
+#: g10/gpg.c:3101
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s, %s ile henüz çalışmıyor\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3148
 #, 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:3143
+#: g10/gpg.c:3153
 #, 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:3148
+#: g10/gpg.c:3158
 #, 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:3250
+#: g10/gpg.c:3260
 #, 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:3261
+#: g10/gpg.c:3271
 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:3272
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3291
 #, 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:3291
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3314
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3306
+#: g10/gpg.c:3316
 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:3309
+#: g10/gpg.c:3319
 #, 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:3327
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3365
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3367
 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:3360
+#: g10/gpg.c:3370
 #, 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:3380
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3426
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kullanıcı-kimliği] [anahtar-zinciri]"
 
-#: g10/gpg.c:3560
+#: g10/gpg.c:3570
 #, 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:3562
+#: g10/gpg.c:3572
 #, 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:3564
+#: g10/gpg.c:3574
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3585
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "anahtar sunucusunda arama başarısız: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3595
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/gpg.c:3644
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' hash algoritması geçersiz\n"
 
-#: g10/gpg.c:3854
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/gpg.c:3858
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4172
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4174
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4207
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
@@ -1809,43 +1814,43 @@ 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:2380 g10/keyedit.c:3712
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, 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:2611
+#: g10/getkey.c:2614
 #, 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:2658
+#: g10/getkey.c:2661
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "anahtar %s: genel anahtarsız gizli anahtar - atlandı\n"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:73
 msgid "be somewhat more quiet"
 msgstr "daha az detaylı"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "take the keys from this keyring"
 msgstr "anahtarlar bu anahtarlıktan alınır"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:76
 msgid "make timestamp conflicts only a warning"
 msgstr "zaman damgası çelişkilerini uyarı olarak bildirir"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:77
 msgid "|FD|write status info to this FD"
 msgstr "|FD|durum bilgisini bu FD'ye yazar"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:101
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Kullanımı: gpgv [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:104
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2375,7 +2380,7 @@ msgstr "anahtar %s: yeni anahtar - atlandı\n"
 msgid "no writable keyring found: %s\n"
 msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "\"%s\"e yazıyor\n"
@@ -2736,42 +2741,42 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "Bu imzayı kısıtlayacak bir etki alanı girin, yoksa <enter> tuşlayın.\n"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
+#: g10/keyedit.c:890 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
+#: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  İmzalanamıyor.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Kullanıcı kimliği \"%s\" zamanaşımına uğradı."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Kullanıcı kimliği \"%s\" öz-imzalı değil."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Kullanıcı kimliği \"%s\" öz-imzalı değil."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H) "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2780,11 +2785,11 @@ msgstr ""
 "\"%s\" üzerindeki öz-imza\n"
 "bir PGP 2.x tarzı imza.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Bir OpenPGP öz-imzası haline getirilmesini istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2793,12 +2798,12 @@ msgstr ""
 "\"%s\" üzerindeki imzanızın\n"
 "kullanım süresi dolmuş.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Yeni imzanızın süresi dolmuş biriyle değiştirilmesini ister misiniz? (e/H) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2807,44 +2812,44 @@ msgstr ""
 "\"%s\" üzerindeki imzanız\n"
 "dahili bir imza.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Bu imzanın dışarda da geçerli hale getirilmesini istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" zaten %s anahtarıyla yerel olarak imzalanmış\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" zaten %s anahtarıyla imzalanmış\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "%s anahtarı ile imzalanacak hiçbir şey yok\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Bu anahtarın kullanım süresi dolmuş!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitiyor.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "İmzanızın da bu kadar süre geçerli olmasını ister misiniz? (E/h) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:883
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2852,11 +2857,11 @@ msgstr ""
 "--pgp2 kipinde bir PGP 2.x anahtarlara bir OpenPGP imzası "
 "uygulanamayabilir.\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:885
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Bu, anahtarı PGP 2.x için kullanışsız yapacak.\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:910
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2865,31 +2870,31 @@ msgstr ""
 "Bu anahtarın ismi yukarda yazılı kişiye ait olduğunu ne kadar dikkatli\n"
 "doğruladınız?  Bu sorunun cevabını bilmiyorsanız \"0\" yazın.\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Cevabı bilmiyorum. %s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Tamamen kontrol edildi.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) İlişkisel denetim yaptım.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Çok dikkatli bir denetim yaptım.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:927
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Seçiminiz? (daha fazla bilgi için: '?'): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:951
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2899,76 +2904,76 @@ msgstr ""
 "gerçekten\n"
 "emin misiniz?\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:958
 msgid "This will be a self-signature.\n"
 msgstr "Bu bir öz-imza olacak.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:964
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "UYARI: imza dışarı gönderilemez olarak imlenmeyecek.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:972
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "UYARI: imza yürürlükten kaldırılamaz olarak imlenmeyecek.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:982
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "İmza dışarı gönderilemez olarak imlenecek.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:989
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "İmza yürürlükten kaldırılamaz olarak imlenecek.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:996
 msgid "I have not checked this key at all.\n"
 msgstr "Her şeyiyle bu anahtarı sınayamadım.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1001
 msgid "I have checked this key casually.\n"
 msgstr "Bu anahtarı karşılaştırmalı olarak sınadım.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1006
 msgid "I have checked this key very carefully.\n"
 msgstr "Bu anahtarı çok dikkatle sınadım.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1016
 msgid "Really sign? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H) "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
-#: g10/keyedit.c:5004 g10/sign.c:352
+#: g10/keyedit.c:1061 g10/keyedit.c:4793 g10/keyedit.c:4884 g10/keyedit.c:4948
+#: g10/keyedit.c:5009 g10/sign.c:351
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1126
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "Anahtar sadece kısa veya karta özel öğeler içeriyor,\n"
 "değiştirilecek bir anahtar parolası yok.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1137 g10/keygen.c:3215
 msgid "This key is not protected.\n"
 msgstr "Bu anahtar korunmamış.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1145 g10/keygen.c:3218
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Asıl anahtarın gizli parçaları kart üzerinde saklı.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1149 g10/keygen.c:3222
 msgid "Key is protected.\n"
 msgstr "Anahtar korunmuş.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1173
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Bu anahtar üzerinde düzenleme yapılamaz: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1179
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2976,13 +2981,13 @@ msgstr ""
 "Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1188 g10/keygen.c:1895
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 "ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
 "tekrarlanacak"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1193
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2990,192 +2995,192 @@ msgstr ""
 "Bir anahtar parolası vermediniz - bu çok *kötü* bir fikir!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1196
 msgid "Do you really want to do this? (y/N) "
 msgstr "Gerçekten bunu yapmak istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1267
 msgid "moving a key signature to the correct place\n"
 msgstr "bir anahtar imzası doğru yere taşınıyor\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1353
 msgid "save and quit"
 msgstr "kaydet ve çık"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1356
 msgid "show key fingerprint"
 msgstr "parmakizini gösterir"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1357
 msgid "list key and user IDs"
 msgstr "anahtarı ve kullanıcı kimliğini gösterir"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1359
 msgid "select user ID N"
 msgstr "N kullanıcı kimliğini seçer"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1360
 msgid "select subkey N"
 msgstr "N yardımcı anahtarını"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1361
 msgid "check signatures"
 msgstr "imzaları sınar"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1366
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "seçilen kullanıcı kimliği imzalar [* ilgili komutlar için aşağıya bakın]"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs locally"
 msgstr "kullanıcı kimlikleri yerel olarak imzalar"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a trust signature"
 msgstr "seçili kullanıcı kimlikleri bir güvence imzasıyla imzalar"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 "seçili kullanıcı kimlikleri yürürlükten kaldırılamayan bir imzayla imzalar"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1379
 msgid "add a user ID"
 msgstr "bir kullanıcı kimliği ekler"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1381
 msgid "add a photo ID"
 msgstr "bir foto kimliği ekler"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1383
 msgid "delete selected user IDs"
 msgstr "seçili kullanıcı kimlikleri siler"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1388
 msgid "add a subkey"
 msgstr "bir yardımcı anahtar ekler"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1392
 msgid "add a key to a smartcard"
 msgstr "bir akıllı karta bir anahtar ekler"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1394
 msgid "move a key to a smartcard"
 msgstr "bir akıllı karttan bir anahtarı taşır"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1396
 msgid "move a backup key to a smartcard"
 msgstr "bir akıllı karttan bir yedekleme anahtarını taşır"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1400
 msgid "delete selected subkeys"
 msgstr "seçili yardımcı anahtarları siler"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1402
 msgid "add a revocation key"
 msgstr "bir yürürlükten kaldırma anahtarı ekler"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1404
 msgid "delete signatures from the selected user IDs"
 msgstr "seçili kullanıcı kimliklerden imzaları siler"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1406
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 "anahtar için ya da seçili yardımcı anahtarlar için zamanaşımı tarihini "
 "değiştirir"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1408
 msgid "flag the selected user ID as primary"
 msgstr "seçili kullanıcı kimliğini asıl olarak imler"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1410
 msgid "toggle between the secret and public key listings"
 msgstr "genel ve gizli anahtar listeleri arasında yer değiştirir"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1413
 msgid "list preferences (expert)"
 msgstr "tercihleri listeler (uzman)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1415
 msgid "list preferences (verbose)"
 msgstr "tercihleri listeler (ayrıntılı)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1417
 msgid "set preference list for the selected user IDs"
 msgstr "Seçili kullanıcı kimlikler için tercih listesini belirler "
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "Seçili kullanıcı kimlikler için tercih edilen anahtar sunucu adresini "
 "belirler"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Seçili kullanıcı kimlikler için tercih listesini belirler "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "anahtar parolasını değiştirir"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "sahibiningüvencesini değiştirir"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1432
 msgid "revoke signatures on the selected user IDs"
 msgstr "Seçili tüm kullanıcı kimliklerdeki imzaları yürürlükten kaldırır"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1434
 msgid "revoke selected user IDs"
 msgstr "Seçili tüm kullanıcı kimlikleri yürürlükten kaldırır"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1439
 msgid "revoke key or selected subkeys"
 msgstr "anahtarı ya da seçili yardımcı anahtarları yürürlükten kaldırır"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1440
 msgid "enable key"
 msgstr "anahtarı kullanıma sokar"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1441
 msgid "disable key"
 msgstr "anahtarı iptal eder"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1442
 msgid "show selected photo IDs"
 msgstr "seçili foto kimlikleri gösterir"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1446
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1564
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "gizli anahtar bloğu \"%s\" okunurken hata oluştu: %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1582
 msgid "Secret key is available.\n"
 msgstr "Gizli anahtar mevcut.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1663
 msgid "Need the secret key to do this.\n"
 msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1671
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "lütfen önce \"seçmece\" komutunu kullanın.\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1690
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3187,240 +3192,240 @@ msgstr ""
 "  için 'nr', yerel imzalar için 'l' (lsign) veya buların karışımı   olarak "
 "(ltsign, tnrsign gibi).\n"
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1730
 msgid "Key is revoked."
 msgstr "Anahtar yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1749
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Tüm kullanıcı kimlikler gerçekten imzalanacak mı? (e/H ya da y/N)"
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1756
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "İpucu: İmzalamak için bir kullanıcı kimliği seçiniz\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1765
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "imza türü `%s' bilinmiyor\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1788
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s kipindeyken bu komut kullanılamaz.\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
 msgid "You must select at least one user ID.\n"
 msgstr "En az bir kullanıcı kimliği seçmelisiniz.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1812
 msgid "You can't delete the last user ID!\n"
 msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1814
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr ""
 "Seçilen tüm kullanıcı kimlikler gerçekten silinecek mi? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1815
 msgid "Really remove this user ID? (y/N) "
 msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1865
 msgid "Really move the primary key? (y/N) "
 msgstr "Bu öz-imza gerçekten taşınacak mı?  (e/H ya da y/N) "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1877
 msgid "You must select exactly one key.\n"
 msgstr "Sadece ve sadece bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1905
 msgid "Command expects a filename argument\n"
 msgstr "Komut argüman olarak bir dosya ismi gerektiriyor\n"
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1919
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1936
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "yedekleme anahtarı `%s' den okunurken hata oluştu: %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1960
 msgid "You must select at least one key.\n"
 msgstr "En az bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1963
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Seçilen anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1964
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:1999
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 "Seçilen tüm kullanıcı kimlikleri gerçekten yürülükten kaldırılacak mı? (e/H "
 "ya da y/N) "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2000
 msgid "Really revoke this user ID? (y/N) "
 msgstr ""
 "Bu kullanıcı kimliği gerçekten yürürlükten kaldırılacak mı? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2018
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr ""
 "Anahtarın tamamını yürürlükten kaldırmayı gerçekten istiyor musunuz? (e/H ya "
 "da y/N) "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2029
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr ""
 "Seçili yardımcı anahtarları gerçekten yürürlükten kaldırmak istiyor musunuz? "
 "(e/H ya da y/N) "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2031
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr ""
 "Bu yardımcı anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? (e/H "
 "ya da y/N) "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2081
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "Kullanıcı taraından sağlanmış bir güvence veritabanı kullanılarak "
 "sahibiningüvencesi belirlenemez\n"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2123
 msgid "Set preference list to:\n"
 msgstr "Belirlenecek tercih listesi:\n"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2129
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Seçili kullanıcı kimlikler için tercihleri gerçekten güncellemek istiyor "
 "musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2131
 msgid "Really update the preferences? (y/N) "
 msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2199
 msgid "Save changes? (y/N) "
 msgstr "Değişiklikler kaydedilecek mi? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2202
 msgid "Quit without saving? (y/N) "
 msgstr "Kaydetmeden çıkılsın mı? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2212
 #, c-format
 msgid "update failed: %s\n"
 msgstr "güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gizliyi güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2226
 msgid "Key not changed so no update needed.\n"
 msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2327
 msgid "Digest: "
 msgstr "Özümlenen: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2379
 msgid "Features: "
 msgstr "Özellikler: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2390
 msgid "Keyserver no-modify"
 msgstr "Anahtar sunucusu değişmez"
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2405 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Tercih edilen anahtar sunucusu: "
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2413 g10/keyedit.c:2414
 #, fuzzy
 msgid "Notations: "
 msgstr "Niteleme: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2624
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Bir PGP 2.x tarzı kullanıcı kimliğine uygun tercih yok.\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2683
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr ""
 "Bu anahtar %2$s tarafından %3$s anahtarıyla %1$s üzerinde yürürlükten "
 "kaldırılmış\n"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2704
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 "Bu anahtar %s tarafından %s anahtarıyla yürürlükten kaldırılmış olabilir"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2710
 msgid "(sensitive)"
 msgstr "(duyarlı)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keyedit.c:2726 g10/keyedit.c:2782 g10/keyedit.c:2843 g10/keyedit.c:2858
 #: g10/keylist.c:194 g10/keyserver.c:511
 #, c-format
 msgid "created: %s"
 msgstr "oluşturuldu: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2729 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
 #, c-format
 msgid "revoked: %s"
 msgstr "yürürlükten kaldırıldı: %s"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2731 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2733 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
 #, c-format
 msgid "expires: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2735
 #, c-format
 msgid "usage: %s"
 msgstr "kullanımı: %s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2750
 #, c-format
 msgid "trust: %s"
 msgstr "güvencesi: %s"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2754
 #, c-format
 msgid "validity: %s"
 msgstr "geçerliliği: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2761
 msgid "This key has been disabled"
 msgstr "Bu anahtar iptal edilmişti"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2789 g10/keylist.c:200
 msgid "card-no: "
 msgstr "kart-no: "
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2813
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3428,17 +3433,17 @@ 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:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "yürürlükten kaldırıldı"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "zamanaşımına uğradı"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2944
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3447,7 +3452,7 @@ msgstr ""
 "       farklı bir kullanıcı kimliğin birincil kullanıcı kimlik olarak\n"
 "       kabul edilmesini sağlayabilirsiniz.\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3005
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3456,75 +3461,75 @@ msgstr ""
 "UYARI: Bu PGP-2 tarzı bir anahtar. Bir foto kimliği eklenmesi bu anahtarın\n"
 "       bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3351
+#: g10/keyedit.c:3010 g10/keyedit.c:3345
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Onu yine de eklemek istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3016
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2 tarzı bir anahtara bir foto kimliği ekleyemeyebilirsiniz.\n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3156
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Bu doğru imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3166
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Bu geçersiz imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3170
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3176
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Bu öz-imza gerçekten silinecek mi? (e/H)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3190
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3191
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3194
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3227 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "geçersiz zırh"
 
-#: g10/keyedit.c:3235
+#: g10/keyedit.c:3229
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:3242
+#: g10/keyedit.c:3236
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3237
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3246
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3340
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3534,372 +3539,372 @@ msgstr ""
 "       eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
 "       ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3351
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "PGP2 tarzı bir anahtara tasarlanmış bir yürürlükten kaldırıcı "
 "ekleyemeyebilirsiniz.\n"
 
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3371
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 "Tasarlanmış yürürlükten kaldırma anahtarının kullanıcı kimliğini giriniz: "
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3396
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "bir PGP 2.x tarzı anahtar bir tasarlanmış yürürlükten kaldırma anahtarı "
 "olarak atanamaz\n"
 
-#: g10/keyedit.c:3417
+#: g10/keyedit.c:3411
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "bir anahtarı kendisini yürürlükten kaldıracak anahtar olarak "
 "kullanamazsınız\n"
 
-#: g10/keyedit.c:3439
+#: g10/keyedit.c:3433
 msgid "this key has already been designated as a revoker\n"
 msgstr "bu anahtar zaten onu üreten tarafından yürürlükten kaldırılmıştı\n"
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3452
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "UYARI: yürürlükten kaldıran olarak tasarlanmış bir anahtar başka amaçla\n"
 "       kullanılamaz!\n"
 
-#: g10/keyedit.c:3464
+#: g10/keyedit.c:3458
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "bir anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
 "misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:3525
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
 
-#: g10/keyedit.c:3531
+#: g10/keyedit.c:3526
 msgid "Please select at most one subkey.\n"
 msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3530
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:3538
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Asıl anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3582
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3598
 msgid "No corresponding signature in secret ring\n"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3678
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "UYARI: yardımcı imzalama anahtarı %s çapraz sertifikalı değil\n"
 
-#: g10/keyedit.c:3679
+#: g10/keyedit.c:3684
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3841
+#: g10/keyedit.c:3846
 msgid "Please select exactly one user ID.\n"
 msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
 
-#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
+#: g10/keyedit.c:3885 g10/keyedit.c:3995 g10/keyedit.c:4115 g10/keyedit.c:4256
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "kullanıcı kimliği \"%s\" için v3 öz-imzası atlanıyor\n"
 
-#: g10/keyedit.c:4051
+#: g10/keyedit.c:4056
 msgid "Enter your preferred keyserver URL: "
 msgstr "Tercih ettiğiniz sunucunun adresini girin: "
 
-#: g10/keyedit.c:4131
+#: g10/keyedit.c:4136
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Onu değiştirmek istediğinizden emin misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4132
+#: g10/keyedit.c:4137
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Onu silmek istediğinizden emin misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4199
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "imza niteleyici: "
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4348
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Üzerine yazılsın mı? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4407
+#: g10/keyedit.c:4412
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4470
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:4492
+#: g10/keyedit.c:4497
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d indisli bir yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:4627
+#: g10/keyedit.c:4632
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Kullanıcı kimliği: \"%s\"\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4635 g10/keyedit.c:4699 g10/keyedit.c:4742
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s anahtarınızla %s%s%s de imzalandı\n"
 
-#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 msgid " (non-exportable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4641
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
 
-#: g10/keyedit.c:4640
+#: g10/keyedit.c:4645
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Onu yine de yürürlükten kaldırmak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:4644
+#: g10/keyedit.c:4649
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H) "
 
-#: g10/keyedit.c:4671
+#: g10/keyedit.c:4676
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Bu kullanıcı kimliklerini %s anahtarı üzerinde imzalamışsınız:\n"
 
-#: g10/keyedit.c:4697
+#: g10/keyedit.c:4702
 msgid " (non-revocable)"
 msgstr " (yürülükten kaldırılmaz)"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4709
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "%s tarafından %s de yürürlükten kaldırılmış\n"
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4731
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:4746
+#: g10/keyedit.c:4751
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 "Bu yürürlükten kaldırma sertifikalarını gerçekten oluşturacak mısınız? (e/H) "
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4781
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:4846
+#: g10/keyedit.c:4851
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:4863
+#: g10/keyedit.c:4868
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "UYARI: bir kullanıcı kimliği imzası %d saniye gelecekte oluşturuldu\n"
 
-#: g10/keyedit.c:4927
+#: g10/keyedit.c:4932
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:4989
+#: g10/keyedit.c:4994
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Yardımcı anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:5084
+#: g10/keyedit.c:5089
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Anahtar 0x%3$s (kull-kiml %4$d) için %2$ld uzunluktaki %1$s foto kimliği "
 "gösteriliyor\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "'%s' tercihi yinelendi\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 msgid "too many cipher preferences\n"
 msgstr "çok fazla şifreleme tercihi\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 msgid "too many digest preferences\n"
 msgstr "çok fazla özümleme tercihi\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 msgid "too many compression preferences\n"
 msgstr "çok fazla sıkıştırma tercihi\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "tercih dizgesindeki '%s' öğesi geçersiz\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:876
 msgid "writing direct signature\n"
 msgstr "doğrudan imza yazılıyor\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:915
 msgid "writing self signature\n"
 msgstr "öz-imza yazılıyor\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:965
 msgid "writing key binding signature\n"
 msgstr "anahtarı garantileyen imzayı yazıyor\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
+#: g10/keygen.c:2776
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1331
 msgid "Sign"
 msgstr "İmzalama"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1334
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1337
 msgid "Encrypt"
 msgstr "Şifreleme"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1340
 msgid "Authenticate"
 msgstr "Kimlik kanıtlama"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1348
 msgid "SsEeAaQq"
 msgstr "İiŞşKkçÇ"
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1367
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "bir %s anahtarı için olası eylemler: "
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1371
 msgid "Current allowed actions: "
 msgstr "Şimdilik mümkün eylemler: "
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1376
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) İmzalama yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1379
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Şifreleme yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1382
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Kimlik kanıtlama yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1385
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Bitti\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1441
 msgid "Please select what kind of key you want:\n"
 msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1443
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "  (%d) DSA ve ElGamal (öntanımlı)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (yalnız imzalamak için)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1446
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (yeteneklerini belirtin)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1448
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (yalnız şifrelemek için)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (sadece imzalamak için)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (sadece şifrelemek için)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1453
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (yeteneklerini belirtin)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1522
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA anahtar çifti %u bit olacak.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1532
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s anahtarları %u bit ile %u bit arasında olmalı.\n"
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1539
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1553
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s anahtar uzunlukları %u-%u aralığında olmalı\n"
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1559
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "İstenen anahtar uzunluğu: %u bit\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1564 g10/keygen.c:1569
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u bite yuvarlandı\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1618
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3915,7 +3920,7 @@ msgstr ""
 "      <n>m = anahtar n ay geçerli\n"
 "      <n>y = anahtar n yıl geçerli\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1629
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3931,38 +3936,38 @@ msgstr ""
 "      <n>m = imza n ay geçerli\n"
 "      <n>y = imza n yıl geçerli\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Key is valid for? (0) "
 msgstr "Anahtar ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "İmza ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1673
 msgid "invalid value\n"
 msgstr "değer hatalı\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1680
 msgid "Key does not expire at all\n"
 msgstr "Anahtar hep geçerli olacak\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Signature does not expire at all\n"
 msgstr "İmza hep geçerli olacak\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1686
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Anahtarın geçerliliği %s de bitecek.\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1687
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "İmzanın geçerliliği %s de bitecek.\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1693
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3970,11 +3975,11 @@ msgstr ""
 "Sisteminiz 2038 yılından sonraki tarihleri gösteremiyor.\n"
 "Ama emin olun ki 2106 yılına kadar elde edilebilecek.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1698
 msgid "Is this correct? (y/N) "
 msgstr "Bu doğru mu? (e/H ya da y/N) "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1713
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3990,44 +3995,44 @@ msgstr ""
 "\t\"Fatih Sultan Mehmed (Padisah) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1726
 msgid "Real name: "
 msgstr "Adınız ve Soyadınız: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Invalid character in name\n"
 msgstr "Ad ve soyadınızda geçersiz karakter var\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name may not start with a digit\n"
 msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1738
 msgid "Name must be at least 5 characters long\n"
 msgstr "Ad ve soyadınız en az 5 harfli olmalı\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1746
 msgid "Email address: "
 msgstr "E-posta adresiniz: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1752
 msgid "Not a valid email address\n"
 msgstr "geçerli bir E-posta adresi değil\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1760
 msgid "Comment: "
 msgstr "Önbilgi: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1766
 msgid "Invalid character in comment\n"
 msgstr "Önbilgi alanında geçersiz karakter var\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1789
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1795
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4038,7 +4043,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1800
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Lütfen E-posta adresinizi Adı ve Soyadı veya Açıklama alanı içine koymayın\n"
@@ -4054,24 +4059,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 msgid "NnCcEeOoQq"
 msgstr "AaYyEeTtKk"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1826
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da Çı(k)? "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:1846
 msgid "Please correct the error first\n"
 msgstr "Lütfen önce hatayı düzeltin\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1886
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4079,12 +4084,12 @@ msgstr ""
 "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:1896 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1902
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4096,7 +4101,7 @@ msgstr ""
 "seçeneği ile kullanarak her zaman değiştirebilirsiniz.\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:1924
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4109,50 +4114,50 @@ msgstr ""
 "iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
 "üretecine yardımcı olur. \n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2722
 msgid "Key generation canceled.\n"
 msgstr "Anahtar üretimi durduruldu.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:2921 g10/keygen.c:3068
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "genel anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:2923 g10/keygen.c:3071
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "gizli anahtar koçanı `%s'e yazılıyor\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:2926 g10/keygen.c:3074
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3057
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3063
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "yazılabilir bir gizli anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3081
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "`%s' genel anahtar zincirine yazılırken hata oluştu: %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3088
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "`%s' gixli anahtar zincirine yazılırken hata oluştu: %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3111
 msgid "public and secret key created and signed.\n"
 msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3122
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4160,19 +4165,19 @@ msgstr ""
 "Bu anahtar şifreleme için kullanılamaz. Şifreleme için yardımcı anahtarı\n"
 "\"--edit-key\" seçeneğini kullanarak üretebilirsiniz.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "anahtar %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4180,26 +4185,26 @@ msgstr ""
 "anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
 "problemi)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3197 g10/keygen.c:3326
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "BİLGİ: v3 anahtarları için yardımcı anahtar üretimi OpenPGP uyumlu değildir\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3236 g10/keygen.c:3359
 msgid "Really create? (y/N) "
 msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3524
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "anahtarın kart üzerinde saklanması başarısız: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3571
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "'%s' yedek dosyası oluşturulamıyor: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3597
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "BİLGİ: kart anahtarının yedeklemesi '%s' e kaydedildi\n"
@@ -4476,211 +4481,215 @@ msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:239
 #, 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:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s şifreli oturum anahtarı\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:300
 #, 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:382
+#: g10/mainproc.c:381
 #, c-format
 msgid "public key is %s\n"
 msgstr "genel anahtar: %s\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:438
 msgid "public key encrypted data: good DEK\n"
 msgstr "genel anahtarla şifreli veri: doğru DEK\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:471
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:475 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:479
 #, 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:494
+#: g10/mainproc.c:493
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "genel anahtar şifre çözümü başarısız: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:507
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:509
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:540 g10/mainproc.c:562
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s şifreli veri varsayılıyor\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:548
 #, 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:581
+#: g10/mainproc.c:580
 msgid "decryption okay\n"
 msgstr "Şifre çözme tamam\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:584
 msgid "WARNING: message was not integrity protected\n"
 msgstr "UYARI: ileti bütünlük korumalı değildi\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:597
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "UYARI: şifreli ileti tahrip edilmiş!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:603
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "şifre çözme başarısız: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:624
 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:625
+#: g10/mainproc.c:626
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "özgün dosya adı = '%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:711
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr ""
+
+#: g10/mainproc.c:839
 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:1165
+#: g10/mainproc.c:1187
 #, fuzzy
 msgid "no signature found\n"
 msgstr "\"%s\" deki imza iyi"
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1430
 msgid "signature verification suppressed\n"
 msgstr "imza doğrulama engellendi\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1539
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "bu çoklu imzalar elde edilemiyor\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1550
 #, c-format
 msgid "Signature made %s\n"
 msgstr "İmza %s de\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1551
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s kullanılarak anahtar %s ile yapılmış\n"
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1555
 #, 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:1544
+#: g10/mainproc.c:1575
 msgid "Key available at: "
 msgstr "Anahtar burada:"
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "\"%s\" deki imza KÖTÜ"
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "\"%s\" deki imza zamanaşımına uğramış"
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "\"%s\" deki imza iyi"
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr "[şüpheli]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1797
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                nam-ı diğer \"%s\""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1895
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitti.\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1900
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1903
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s imzası, %s özümleme algoritması\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr "ikili"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr "metinkipi"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "İmza kontrol edilemedi: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
 msgstr "bir bağımsız imza değil\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:2037
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "UYARI: çoklu imzalar saptandı. Sadece ilki denetlenecek.\n"
 
-#: g10/mainproc.c:2013
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x sınıfı tek başına imza\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr "eski stil (PGP 2.x) imza\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() içinde geçersiz kök paket saptandı\n"
 
@@ -4814,16 +4823,16 @@ msgstr ""
 msgid "directory `%s' created\n"
 msgstr "dizin `%s' oluşturuldu\n"
 
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:143
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "%d genel anahtar algoritması kullanılamadı\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:713
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
 
-#: g10/parse-packet.c:1159
+#: g10/parse-packet.c:1164
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
@@ -5574,12 +5583,12 @@ msgstr ""
 "UYARI: tercih edilen anahtar sunucu adresi için %%lik uzatma imkansız\n"
 "(çok büyük). Uzatılmadan kullanılıyor.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:346
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:355
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s imza: \"%s\" den\n"
@@ -5601,13 +5610,13 @@ msgstr ""
 msgid "signing:"
 msgstr "imzalanıyor:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1101
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla açık imzalama "
 "yapabilirsiniz\n"
 
-#: g10/sign.c:1278
+#: g10/sign.c:1280
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s şifrelemesi kullanılmayacak\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d6733162e..259c9f235 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-12-04 15:05+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2006-07-02 10:58+0800\n"
 "Last-Translator: Meng Jie <[email protected]>\n"
 "Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -45,10 +45,10 @@ msgstr "等待‘%s’上的锁\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
+#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -81,9 +81,9 @@ msgstr "无法读取‘%s’：%s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "注意：随机数种子文件未被更新\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
+#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
+#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "无法建立‘%s’：%s\n"
@@ -388,14 +388,14 @@ msgstr "OpenPGP 卡不可用：%s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "检测到 OpenPGP 卡号 %s\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
+#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "在批处理模式中无法完成此操作\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
+#: g10/keygen.c:1456
 msgid "Your selection? "
 msgstr "您的选择？ "
 
@@ -561,8 +561,8 @@ msgstr "  (2) 加密密钥\n"
 msgid "   (3) Authentication key\n"
 msgstr "  (3) 认证密钥\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
+#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "无效的选择。\n"
 
@@ -582,7 +582,7 @@ msgstr "私钥部分不可用\n"
 msgid "secret key already stored on a card\n"
 msgstr "私钥已存储在卡上\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1319 g10/keyedit.c:1351
 msgid "quit this menu"
 msgstr "离开这个菜单"
 
@@ -590,7 +590,7 @@ msgstr "离开这个菜单"
 msgid "show admin commands"
 msgstr "显示管理员命令"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1322 g10/keyedit.c:1354
 msgid "show this help"
 msgstr "显示这份在线说明"
 
@@ -642,7 +642,7 @@ msgstr "更改或解锁 PIN 的菜单"
 msgid "verify the PIN and list all data"
 msgstr "验证 PIN 并列出所有数据"
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1457 g10/keyedit.c:1617
 msgid "Command> "
 msgstr "命令> "
 
@@ -658,7 +658,7 @@ msgstr "允许使用管理员命令\n"
 msgid "Admin commands are not allowed\n"
 msgstr "不允许使用管理员命令\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1602 g10/keyedit.c:2238
 msgid "Invalid command  (try \"help\")\n"
 msgstr "无效的指令(尝试“help”)\n"
 
@@ -713,7 +713,7 @@ msgstr "再次输入此 PIN："
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN 再次输入时与首次输入不符；请再试一次"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -723,7 +723,7 @@ 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:3392 g10/keyserver.c:1705
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3386 g10/keyserver.c:1705
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -769,7 +769,7 @@ msgstr "公钥“%s”有对应的私钥！\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "请先使用“--delete-secret-keys”选项来删除它。\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:213 g10/sign.c:1286
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
@@ -835,12 +835,12 @@ msgstr "您不该将 %s 用于 %s 模式中\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已经加密给：“%s”\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:292
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 加密过的数据\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:296
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以未知的算法 %d 加密\n"
@@ -972,7 +972,7 @@ msgstr "警告：私钥 %s 不存在简单 SK 检验和\n"
 msgid "WARNING: nothing exported\n"
 msgstr "警告：没有导出任何东西\n"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:379
 msgid ""
 "@Commands:\n"
 " "
@@ -980,127 +980,127 @@ msgstr ""
 "@指令：\n"
 " "
 
-#: g10/gpg.c:380
+#: g10/gpg.c:381
 msgid "|[file]|make a signature"
 msgstr "|[文件名]|生成一份签名"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "|[file]|make a clear text signature"
 msgstr "|[文件名]|生成一份明文签名"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:383
 msgid "make a detached signature"
 msgstr "生成一份分离的签名"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "encrypt data"
 msgstr "加密数据"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "encryption only with symmetric cipher"
 msgstr "仅使用对称加密"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "decrypt data (default)"
 msgstr "解密数据(默认)"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "verify a signature"
 msgstr "验证签名"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "list keys"
 msgstr "列出密钥"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:394
 msgid "list keys and signatures"
 msgstr "列出密钥和签名"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "list and check key signatures"
 msgstr "列出并检查密钥签名"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "list keys and fingerprints"
 msgstr "列出密钥和指纹"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "list secret keys"
 msgstr "列出私钥"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "generate a new key pair"
 msgstr "生成一副新的密钥对"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "remove keys from the public keyring"
 msgstr "从公钥钥匙环里删除密钥"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "remove keys from the secret keyring"
 msgstr "从私钥钥匙环里删除密钥"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "sign a key"
 msgstr "为某把密钥添加签名"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "sign a key locally"
 msgstr "为某把密钥添加本地签名"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:404
 msgid "sign or edit a key"
 msgstr "编辑某把密钥或为其添加签名"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "generate a revocation certificate"
 msgstr "生成一份吊销证书"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "export keys"
 msgstr "导出密钥"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:408
 msgid "export keys to a key server"
 msgstr "把密钥导出到某个公钥服务器上"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:409
 msgid "import keys from a key server"
 msgstr "从公钥服务器上导入密钥"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "search for keys on a key server"
 msgstr "在公钥服务器上搜寻密钥"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:413
 msgid "update all keys from a keyserver"
 msgstr "从公钥服务器更新所有的本地密钥"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:417
 msgid "import/merge keys"
 msgstr "导入/合并密钥"
 
-#: g10/gpg.c:419
+#: g10/gpg.c:420
 msgid "print the card status"
 msgstr "打印卡状态"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:421
 msgid "change data on a card"
 msgstr "更改卡上的数据"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:422
 msgid "change a card's PIN"
 msgstr "更改卡的 PIN"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "update the trust database"
 msgstr "更新信任度数据库"
 
-#: g10/gpg.c:437
+#: g10/gpg.c:438
 msgid "|algo [files]|print message digests"
 msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
 
-#: g10/gpg.c:441 g10/gpgv.c:71
+#: g10/gpg.c:442 g10/gpgv.c:70
 msgid ""
 "@\n"
 "Options:\n"
@@ -1110,51 +1110,51 @@ msgstr ""
 "选项：\n"
 " "
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "create ascii armored output"
 msgstr "输出经 ASCII 封装"
 
-#: g10/gpg.c:445
+#: g10/gpg.c:446
 msgid "|NAME|encrypt for NAME"
 msgstr "|某甲|为收件者“某甲”加密"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "use this user-id to sign or decrypt"
 msgstr "使用这个用户标识来签名或解密"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:458
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
 
-#: g10/gpg.c:462
+#: g10/gpg.c:463
 msgid "use canonical text mode"
 msgstr "使用标准的文本模式"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:477
 msgid "use as output file"
 msgstr "指定输出文件"
 
-#: g10/gpg.c:478 g10/gpgv.c:73
+#: g10/gpg.c:479 g10/gpgv.c:72
 msgid "verbose"
 msgstr "详细模式"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "do not make any changes"
 msgstr "不做任何改变"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:491
 msgid "prompt before overwriting"
 msgstr "覆盖前先询问"
 
-#: g10/gpg.c:531
+#: g10/gpg.c:532
 msgid "use strict OpenPGP behavior"
 msgstr "行为严格遵循 OpenPGP 定义"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:533
 msgid "generate PGP 2.x compatible messages"
 msgstr "生成与 PGP 2.x 兼容的报文"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1162,7 +1162,7 @@ msgstr ""
 "@\n"
 "(请参考在线说明以获得所有命令和选项的完整清单)\n"
 
-#: g10/gpg.c:564
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1182,17 +1182,17 @@ msgstr ""
 " --list-keys [某甲]           显示密钥\n"
 " --fingerprint [某甲]         显示指纹\n"
 
-#: g10/gpg.c:763 g10/gpgv.c:98
+#: g10/gpg.c:766 g10/gpgv.c:97
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "请向 <[email protected]> 报告程序缺陷。\n"
 "请向 <[email protected]> 反映简体中文翻译的问题。\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:783
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1202,7 +1202,7 @@ msgstr ""
 "签名、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: g10/gpg.c:794
+#: g10/gpg.c:797
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1210,559 +1210,564 @@ msgstr ""
 "\n"
 "支持的算法：\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid "Pubkey: "
 msgstr "公钥："
 
-#: g10/gpg.c:803 g10/keyedit.c:2310
+#: g10/gpg.c:806 g10/keyedit.c:2304
 msgid "Cipher: "
 msgstr "对称加密："
 
-#: g10/gpg.c:809
+#: g10/gpg.c:812
 msgid "Hash: "
 msgstr "散列："
 
-#: g10/gpg.c:815 g10/keyedit.c:2356
+#: g10/gpg.c:818 g10/keyedit.c:2350
 msgid "Compression: "
 msgstr "压缩："
 
-#: g10/gpg.c:898
+#: g10/gpg.c:901
 msgid "usage: gpg [options] "
 msgstr "用法：gpg [选项] "
 
-#: g10/gpg.c:1046
+#: g10/gpg.c:1049
 msgid "conflicting commands\n"
 msgstr "冲突的指令\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1067
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在‘%s’组定义里找不到等号(=)\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1276
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’权限不安全\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’权限不安全\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’权限不安全\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1288
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1300
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1444
+#: g10/gpg.c:1447
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的配置项‘%s’\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr "列出密钥时显示用户标识"
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr "列出签名时显示策略 URL"
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show all notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr "列出签名时显示用户提供的注记"
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出密钥时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr "列出密钥时显示用户标识的有效性"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出密钥时显示已吊销或已过期的用户标识"
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show the keyring name in key listings"
 msgstr "列出密钥时显示钥匙环的名称"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 msgid "show expiration dates during signature listings"
 msgstr "列出签名时显示过期日期"
 
-#: g10/gpg.c:1954
+#: g10/gpg.c:1957
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n"
 
-#: g10/gpg.c:1996
+#: g10/gpg.c:1999
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "注意：没有默认配置文件‘%s’\n"
 
-#: g10/gpg.c:2000
+#: g10/gpg.c:2003
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: g10/gpg.c:2007
+#: g10/gpg.c:2010
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
 
-#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "注意：一般情况下不会用到 %s！\n"
 
-#: g10/gpg.c:2236
+#: g10/gpg.c:2239
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n"
 
-#: g10/gpg.c:2402 g10/gpg.c:2414
+#: g10/gpg.c:2405 g10/gpg.c:2417
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "‘%s’不是一个有效的签名过期日期\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2494
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s：%d：无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s：%d：无效的导入选项\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s：%d：无效的导出选项\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s：%d：无效的列表选项\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr "验证签名时显示照片标识"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr "验证签名时显示策略 URL"
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 msgid "show all notations during signature verification"
 msgstr "验证签名时显示所有注记"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr "验证签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr "验证签名时显示用户提供的注记"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "验证签名时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 msgid "show user ID validity during signature verification"
 msgstr "验证签名时显示用户标识的有效性"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "验证密钥时显示已吊销或已过期的子钥"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr "使用 PKA 数据验证签名的有效性"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "提升带有有效 PKA 数据的签名的信任度"
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s：%d：无效的校验选项\n"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2603
 msgid "invalid verify options\n"
 msgstr "无效的校验选项\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法把运行路径设成 %s\n"
 
-#: g10/gpg.c:2768
+#: g10/gpg.c:2773
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s：%d：无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2771
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr "无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程序可能会创建核心内存转储！\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告：%s 会使得 %s 失效\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不可与 %s 并用\n"
 
-#: g10/gpg.c:2858
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用无意义！\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2875
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "注意：%s 本版本中不可用\n"
 
-#: g10/gpg.c:2880
+#: g10/gpg.c:2890
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
 
-#: g10/gpg.c:2894
+#: g10/gpg.c:2904
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "您只有在 --pgp2 模式下才能做分离式或明文签名\n"
 
-#: g10/gpg.c:2900
+#: g10/gpg.c:2910
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下时，不能同时签名和加密\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2916
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
 
-#: g10/gpg.c:2919
+#: g10/gpg.c:2929
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 
-#: g10/gpg.c:2986 g10/gpg.c:3010
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的对称加密算法无效\n"
 
-#: g10/gpg.c:2992 g10/gpg.c:3016
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: g10/gpg.c:2998
+#: g10/gpg.c:3008
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/gpg.c:3004
+#: g10/gpg.c:3014
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的证书散列算法无效\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3029
 msgid "completes-needed must be greater than 0\n"
 msgstr "需要的完全可信签名数一定要大于 0\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3031
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需要的勉强可信签名数一定要大于 1\n"
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3033
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "最大验证深度一定要介于 1 和 255 之间\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3035
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3037
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3040
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3044
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3051
 msgid "invalid default preferences\n"
 msgstr "无效的默认首选项\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3060
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人对称加密算法首选项\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3064
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人散列算法首选项\n"
 
-#: g10/gpg.c:3058
+#: g10/gpg.c:3068
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/gpg.c:3091
+#: g10/gpg.c:3101
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚不能和 %s 并用\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3148
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3153
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3158
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "初始化信任度数据库失败：%s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3271
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [文件名]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [文件名]"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3291
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [文件名]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3314
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [文件名]"
 
-#: g10/gpg.c:3306
+#: g10/gpg.c:3316
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3319
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [文件名]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [文件名]"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3365
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [文件名]"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3367
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3370
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [文件名]"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [文件名]"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [文件名]"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key 用户标识"
 
-#: g10/gpg.c:3426
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 用户标识"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 用户标识 [指令]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [用户标识] [钥匙环]"
 
-#: g10/gpg.c:3560
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "上传至公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3572
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥服务器接收失败：%s\n"
 
-#: g10/gpg.c:3564
+#: g10/gpg.c:3574
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败：%s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3585
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "搜寻公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3595
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "从公钥服务器更新失败：%s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3644
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "无效的‘%s’散列算法\n"
 
-#: g10/gpg.c:3854
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[文件名]"
 
-#: g10/gpg.c:3858
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始键入您的报文……\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4172
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的验证策略 URL 无效\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4174
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签名策略 URL 无效\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4207
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
@@ -1785,42 +1790,42 @@ msgstr "自动获取‘%s’，通过 %s\n"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
 
-#: g10/getkey.c:2380 g10/keyedit.c:3712
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公钥 %s 没有相对应的私钥――忽略\n"
 
-#: g10/getkey.c:2611
+#: g10/getkey.c:2614
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "使用子钥 %s 而非主钥 %s\n"
 
-#: g10/getkey.c:2658
+#: g10/getkey.c:2661
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "密钥 %s：无相应公钥的私钥――已跳过\n"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:73
 msgid "be somewhat more quiet"
 msgstr "尽量减少提示信息"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "take the keys from this keyring"
 msgstr "从这个钥匙环里取用密钥"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:76
 msgid "make timestamp conflicts only a warning"
 msgstr "把时间戳矛盾仅视为警告"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:77
 msgid "|FD|write status info to this FD"
 msgstr "|FD|把状态信息写入文件描述符 FD"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:101
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "用法：gpgv [选项] [文件] (用 -h 求助)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:104
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2327,7 +2332,7 @@ msgstr "密钥 %s：新密钥――已跳过\n"
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可写的钥匙环：%s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在写入‘%s’\n"
@@ -2681,41 +2686,41 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "请输入这份签名的限制域，如果没有请按回车。\n"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "用户标识“%s”已被吊销。"
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
+#: g10/keyedit.c:890 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "您仍然想要为它签名吗？(y/N)"
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
+#: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  无法添加签名。\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "用户标识“%s”已过期。"
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "警告：用户标识“%s”不含自身签名。"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "可以为用户标识“%s”添加签名。"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 msgid "Sign it? (y/N) "
 msgstr "为其添加签名吗？(y/N)"
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2724,75 +2729,75 @@ msgstr ""
 "“%s”的自身签名是 PGP 2.x 样\n"
 "式的签名。\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "您是否想要将它升级成 OpenPGP 的自身签名？(y/N)"
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr "您目前为“%s”的签名已经过期了。\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "您想要发布一份新的签名来取代已过期的那一个吗？(y/N)"
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr "您目前为“%s”的签名是一份本地签名。\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "您是否想要把它升级成可以完全导出的签名？(y/N)"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "“%s”已由密钥 %s 在本地签名\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "“%s”已由密钥 %s 签名\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "您仍然想要为它再次签名吗？(y/N)"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "没有东西可以让密钥 %s 签名\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "这把密钥已经过期！"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "这把密钥将在 %s 过期。\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "您想要让您的签名也同时过期吗？ (Y/n) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:883
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "您不能在 --pgp2 模式下，用 PGP 2.x 密钥生成 OpenPGP 签名。\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:885
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "这会让这把密钥在 PGP 2.x 模式下不可使用。\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:910
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2801,31 +2806,31 @@ msgstr ""
 "您是否谨慎地检查过，确认正要签名的密钥的确属于以上它所声称的所有者呢？\n"
 "如果您不知道这个问题的答案，请输入“0”。\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) 我不作答。 %s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) 我根本没有检查过。 %s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) 我随意检查过。 %s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) 我非常小心地检查过。 %s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:927
 msgid "Your selection? (enter `?' for more information): "
 msgstr "您的选择？(输入‘?’以获得更多的信息)："
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:951
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2834,74 +2839,74 @@ msgstr ""
 "您真的确定要签名这把密钥，使用您的密钥\n"
 "“%s”(%s)\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:958
 msgid "This will be a self-signature.\n"
 msgstr "这将是一个自身签名。\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:964
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "警告：这份签名不会被标记为不可导出。\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:972
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "警告：这份签名不会被标记成不可吊销。\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:982
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "这份签名会被标记成不可导出。\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:989
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "这份签名会被标记成不可吊销。\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:996
 msgid "I have not checked this key at all.\n"
 msgstr "我根本没有检查过这把密钥。\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1001
 msgid "I have checked this key casually.\n"
 msgstr "我随意检查过这把密钥。\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1006
 msgid "I have checked this key very carefully.\n"
 msgstr "我非常小心地检查过这把密钥。\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1016
 msgid "Really sign? (y/N) "
 msgstr "真的要签名吗？(y/N)"
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
-#: g10/keyedit.c:5004 g10/sign.c:352
+#: g10/keyedit.c:1061 g10/keyedit.c:4793 g10/keyedit.c:4884 g10/keyedit.c:4948
+#: g10/keyedit.c:5009 g10/sign.c:351
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "签名时失败： %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1126
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "只有占位密钥，或者密钥存储在卡上——没有密码可以更改。\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1137 g10/keygen.c:3215
 msgid "This key is not protected.\n"
 msgstr "这把密钥没有被保护。\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主钥的私钥部分无法取用。\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1145 g10/keygen.c:3218
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主钥的私钥部分存储在卡上。\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1149 g10/keygen.c:3222
 msgid "Key is protected.\n"
 msgstr "密钥受保护。\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1173
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "无法编辑这把密钥： %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1179
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2909,11 +2914,11 @@ msgstr ""
 "输入要给这把私钥用的新密码。\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1188 g10/keygen.c:1895
 msgid "passphrase not correctly repeated; try again"
 msgstr "密码再次输入时与首次输入不符；请再试一次"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1193
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2921,184 +2926,184 @@ msgstr ""
 "您不想要用密码――这大概是个坏主意！\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1196
 msgid "Do you really want to do this? (y/N) "
 msgstr "您真的想要这么做吗？(y/N)"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1267
 msgid "moving a key signature to the correct place\n"
 msgstr "正在把密钥的签名移动到正确的位置去\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1353
 msgid "save and quit"
 msgstr "保存并离开"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1356
 msgid "show key fingerprint"
 msgstr "显示密钥指纹"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1357
 msgid "list key and user IDs"
 msgstr "列出密钥和用户标识"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1359
 msgid "select user ID N"
 msgstr "选择用户标识 N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1360
 msgid "select subkey N"
 msgstr "选择子钥 N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1361
 msgid "check signatures"
 msgstr "检查签名"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1366
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "为所选用户标识添加签名[* 参见下面的相关命令]"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs locally"
 msgstr "为所选用户标识添加本地签名"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a trust signature"
 msgstr "为所选用户标识添加信任签名"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "为所选用户标识添加不可吊销签名"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1379
 msgid "add a user ID"
 msgstr "增加一个用户标识"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1381
 msgid "add a photo ID"
 msgstr "增加一个照片标识"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1383
 msgid "delete selected user IDs"
 msgstr "删除选定的用户标识"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1388
 msgid "add a subkey"
 msgstr "添加一个子钥"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1392
 msgid "add a key to a smartcard"
 msgstr "在智能卡上添加一把密钥"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1394
 msgid "move a key to a smartcard"
 msgstr "将一把密钥移动到智能卡上"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1396
 msgid "move a backup key to a smartcard"
 msgstr "将备份密钥转移到卡上"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1400
 msgid "delete selected subkeys"
 msgstr "删除选定的子钥"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1402
 msgid "add a revocation key"
 msgstr "增加一把吊销密钥"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1404
 msgid "delete signatures from the selected user IDs"
 msgstr "删除所选用户标识上的签名"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1406
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "变更密钥或所选子钥的使用期限"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1408
 msgid "flag the selected user ID as primary"
 msgstr "将所选的用户标识设为首选用户标识"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1410
 msgid "toggle between the secret and public key listings"
 msgstr "在私钥和公钥清单间切换"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1413
 msgid "list preferences (expert)"
 msgstr "列出首选项(专家模式)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1415
 msgid "list preferences (verbose)"
 msgstr "列出首选项(详细模式)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1417
 msgid "set preference list for the selected user IDs"
 msgstr "设定所选用户标识的首选项"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1422
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "设定所选用户标识的首选公钥服务器的 URL"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1424
 msgid "set a notation for the selected user IDs"
 msgstr "为所选用户标识的设定注记"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "更改密码"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "更改信任度"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1432
 msgid "revoke signatures on the selected user IDs"
 msgstr "吊销所选用户标识上的签名"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1434
 msgid "revoke selected user IDs"
 msgstr "吊销选定的用户标识"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1439
 msgid "revoke key or selected subkeys"
 msgstr "吊销密钥或选定的子钥"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1440
 msgid "enable key"
 msgstr "启用密钥"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1441
 msgid "disable key"
 msgstr "禁用密钥"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1442
 msgid "show selected photo IDs"
 msgstr "显示选定的照片标识"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr "压缩不可用的用户标识并删除不可用的签名"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1446
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr "压缩不可用的用户标识并删除所有签名"
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1564
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "读取私钥区块“%s”时出错：%s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1582
 msgid "Secret key is available.\n"
 msgstr "私钥可用。\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1663
 msgid "Need the secret key to do this.\n"
 msgstr "要有私钥才能这么做。\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1671
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "请先使用“toggle”指令。\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1690
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3109,245 +3114,245 @@ msgstr ""
 "  信任签名，或‘nr’前缀(nrsign)以添加不可吊销签名，或者以上三种前缀的任何组\n"
 "  合(ltsign、tnrsign 等)。\n"
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1730
 msgid "Key is revoked."
 msgstr "密钥已被吊销。"
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1749
 msgid "Really sign all user IDs? (y/N) "
 msgstr "真的为所有的用户标识签名吗？(y/N)"
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1756
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "提示：选择要添加签名的用户标识\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1765
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "未知的签名类型‘%s’\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1788
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模式中不允许使用这个指令。\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
 msgid "You must select at least one user ID.\n"
 msgstr "您至少得选择一个用户标识。\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1812
 msgid "You can't delete the last user ID!\n"
 msgstr "您不能删除最后一个用户标识！\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1814
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "真的要删除所有选定的用户标识吗？(y/N)"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1815
 msgid "Really remove this user ID? (y/N) "
 msgstr "真的要删除这个用户标识吗？(y/N)"
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1865
 msgid "Really move the primary key? (y/N) "
 msgstr "真的要删除主钥吗？(y/N)"
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1877
 msgid "You must select exactly one key.\n"
 msgstr "您必须指定一把密钥。\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1905
 msgid "Command expects a filename argument\n"
 msgstr "命令需要一个文件名作为参数\n"
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1919
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "无法打开‘%s’：%s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1936
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "从‘%s’读取备份密钥时出错：%s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1960
 msgid "You must select at least one key.\n"
 msgstr "您必须选择至少一把密钥。\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1963
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "您真的想要删除选定的密钥吗？(y/N)"
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1964
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "您真的要删除这把密钥吗？(y/N)"
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:1999
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "真的要吊销所有选定的用户标识吗？(y/N)"
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2000
 msgid "Really revoke this user ID? (y/N) "
 msgstr "真的要吊销这个用户标识吗？(y/N)"
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2018
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "您真的要吊销整把密钥吗？(y/N)"
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2029
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "您真的要吊销选定的子钥吗？(y/N)"
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2031
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "您真的要吊销这把子钥吗？(y/N)"
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2081
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr "使用用户提供的信任度数据库时信任度可能并未被设定\n"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2123
 msgid "Set preference list to:\n"
 msgstr "设为首选项列表为：\n"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2129
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "真的要更新所选用户标识的首选项吗？(y/N)"
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2131
 msgid "Really update the preferences? (y/N) "
 msgstr "真的要更新首选项吗？(y/N)"
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2199
 msgid "Save changes? (y/N) "
 msgstr "要保存变动吗？(y/N)"
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2202
 msgid "Quit without saving? (y/N) "
 msgstr "要不保存而离开吗？(y/N)"
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2212
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "更新私钥失败：%s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2226
 msgid "Key not changed so no update needed.\n"
 msgstr "密钥没有变动所以不需要更新。\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2327
 msgid "Digest: "
 msgstr "散列："
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2379
 msgid "Features: "
 msgstr "特点："
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2390
 msgid "Keyserver no-modify"
 msgstr "公钥服务器不可变造"
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2405 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "首选公钥服务器："
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2413 g10/keyedit.c:2414
 msgid "Notations: "
 msgstr "注记："
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2624
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2683
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "此密钥已于 %s 被 %s 密钥 %s 所吊销\n"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2704
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "这把密钥可被 %s 密钥 %s 吊销"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2710
 msgid "(sensitive)"
 msgstr " (敏感的)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keyedit.c:2726 g10/keyedit.c:2782 g10/keyedit.c:2843 g10/keyedit.c:2858
 #: g10/keylist.c:194 g10/keyserver.c:511
 #, c-format
 msgid "created: %s"
 msgstr "创建于：%s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2729 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
 #, c-format
 msgid "revoked: %s"
 msgstr "已吊销：%s"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2731 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "已过期：%s"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2733 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
 #, c-format
 msgid "expires: %s"
 msgstr "有效至：%s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2735
 #, c-format
 msgid "usage: %s"
 msgstr "可用于：%s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2750
 #, c-format
 msgid "trust: %s"
 msgstr "信任度：%s"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2754
 #, c-format
 msgid "validity: %s"
 msgstr "有效性：%s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2761
 msgid "This key has been disabled"
 msgstr "这把密钥已经被禁用"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2789 g10/keylist.c:200
 msgid "card-no: "
 msgstr "卡号："
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2813
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "已吊销"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "已过期"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2944
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 "警告：没有首选用户标识。此指令可能假定一个不同的用户标识为首选用户标识。\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3005
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3356,74 +3361,74 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3351
+#: g10/keyedit.c:3010 g10/keyedit.c:3345
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "您确定仍然想要增加吗？(y/N)"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3016
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3156
 msgid "Delete this good signature? (y/N/q)"
 msgstr "删除这个完好的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3166
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "删除这个无效的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3170
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "删除这个未知的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3176
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要删除这个自身签名吗？(y/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3190
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已经删除了 %d 个签名。\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3191
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已经删除了 %d 个签名。\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3194
 msgid "Nothing deleted.\n"
 msgstr "没有东西被删除。\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3227 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "无效"
 
-#: g10/keyedit.c:3235
+#: g10/keyedit.c:3229
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "用户标识“%s”：无用部分已清除\n"
 
-#: g10/keyedit.c:3242
+#: g10/keyedit.c:3236
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3237
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "用户标识“%s”：无用部分已清除\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3246
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "用户标识“%s”：无用部分已清除\n"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3340
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3432,361 +3437,361 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3351
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
 
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3371
 msgid "Enter the user ID of the designated revoker: "
 msgstr "输入指定吊销者的用户标识："
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3396
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "无法将 PGP 2.x 样式的密钥设为指定吊销者\n"
 
 #  This actually causes no harm (after all, a key that
 #  designates itself as a revoker is the same as a
 #  regular key), but it's easy enough to check.
-#: g10/keyedit.c:3417
+#: g10/keyedit.c:3411
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "您不能将某把密钥设为它自己的指定吊销者\n"
 
 #  This actually causes no harm (after all, a key that
 #  designates itself as a revoker is the same as a
 #  regular key), but it's easy enough to check.
-#: g10/keyedit.c:3439
+#: g10/keyedit.c:3433
 msgid "this key has already been designated as a revoker\n"
 msgstr "这把密钥已被指定为一个吊销者\n"
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3452
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n"
 
-#: g10/keyedit.c:3464
+#: g10/keyedit.c:3458
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
 
-#: g10/keyedit.c:3525
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "请从私钥中删除选择。\n"
 
-#: g10/keyedit.c:3531
+#: g10/keyedit.c:3526
 msgid "Please select at most one subkey.\n"
 msgstr "请至多选择一个子钥。\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3530
 msgid "Changing expiration time for a subkey.\n"
 msgstr "将要变更子钥的使用期限。\n"
 
-#: g10/keyedit.c:3538
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "将要变更主钥的使用期限。\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3582
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "您不能变更 v3 密钥的使用期限\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3598
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私钥环里没有相应的签名\n"
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3678
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "签名的子钥 %s 已经交叉验证\n"
 
-#: g10/keyedit.c:3679
+#: g10/keyedit.c:3684
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "子钥 %s 不签名，因此不需要交叉验证\n"
 
-#: g10/keyedit.c:3841
+#: g10/keyedit.c:3846
 msgid "Please select exactly one user ID.\n"
 msgstr "请精确地选择一个用户标识。\n"
 
-#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
+#: g10/keyedit.c:3885 g10/keyedit.c:3995 g10/keyedit.c:4115 g10/keyedit.c:4256
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "跳过用户标识“%s”的 v3 自身签名\n"
 
-#: g10/keyedit.c:4051
+#: g10/keyedit.c:4056
 msgid "Enter your preferred keyserver URL: "
 msgstr "输入您首选的公钥服务器的 URL："
 
-#: g10/keyedit.c:4131
+#: g10/keyedit.c:4136
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "您确定要替换它吗？(y/N)"
 
-#: g10/keyedit.c:4132
+#: g10/keyedit.c:4137
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "您确定要删除它吗？(y/N)"
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4199
 msgid "Enter the notation: "
 msgstr "输入注记："
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4348
 msgid "Proceed? (y/N) "
 msgstr "继续？(y/N)"
 
-#: g10/keyedit.c:4407
+#: g10/keyedit.c:4412
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4470
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "没有散列值为 %s 的用户标识\n"
 
-#: g10/keyedit.c:4492
+#: g10/keyedit.c:4497
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "没有索引为 %d 的子钥\n"
 
-#: g10/keyedit.c:4627
+#: g10/keyedit.c:4632
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "用户标识：“%s”\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4635 g10/keyedit.c:4699 g10/keyedit.c:4742
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "由您的密钥 %s 于 %s%s%s 签名\n"
 
-#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 msgid " (non-exportable)"
 msgstr " (不可导出)"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4641
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "这份签名已在 %s 过期。\n"
 
-#: g10/keyedit.c:4640
+#: g10/keyedit.c:4645
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "您确定您仍然想要吊销它吗？(y/N)"
 
-#: g10/keyedit.c:4644
+#: g10/keyedit.c:4649
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要为这份签名生成一份吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4671
+#: g10/keyedit.c:4676
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "您已经为这些密钥 %s 上的这些用户标识添加签名：\n"
 
-#: g10/keyedit.c:4697
+#: g10/keyedit.c:4702
 msgid " (non-revocable)"
 msgstr " (不可吊销)"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4709
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "由您的密钥 %s 于 %s 吊销\n"
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4731
 msgid "You are about to revoke these signatures:\n"
 msgstr "您正在吊销这些签名：\n"
 
-#: g10/keyedit.c:4746
+#: g10/keyedit.c:4751
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要生成吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4781
 msgid "no secret key\n"
 msgstr "没有私钥\n"
 
-#: g10/keyedit.c:4846
+#: g10/keyedit.c:4851
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "用户标识“%s”已经被吊销。\n"
 
-#: g10/keyedit.c:4863
+#: g10/keyedit.c:4868
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告：有一份用户标识签名的日期标记为 %d 秒后的未来\n"
 
-#: g10/keyedit.c:4927
+#: g10/keyedit.c:4932
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "密钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:4989
+#: g10/keyedit.c:4994
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "子钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:5084
+#: g10/keyedit.c:5089
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在显示 %s 照片标识(大小为 %ld，属于密钥 %s，用户标识 %d)\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "首选项‘%s’重复\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 msgid "too many cipher preferences\n"
 msgstr "太多对称加密算法首选项\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 msgid "too many digest preferences\n"
 msgstr "太多散列算法首选项\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 msgid "too many compression preferences\n"
 msgstr "太多首选压缩算法\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "首选项字符串里有无效项‘%s’\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:876
 msgid "writing direct signature\n"
 msgstr "正在写入直接签名\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:915
 msgid "writing self signature\n"
 msgstr "正在写入自身签名\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:965
 msgid "writing key binding signature\n"
 msgstr "正在写入密钥绑定签名\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
+#: g10/keygen.c:2776
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "密钥尺寸无效：改用 %u 位\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "密钥尺寸舍入到 %u 位\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1331
 msgid "Sign"
 msgstr "签名"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1334
 msgid "Certify"
 msgstr "验证"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1337
 msgid "Encrypt"
 msgstr "加密"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1340
 msgid "Authenticate"
 msgstr "认证"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1348
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1367
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "%s 密钥可能的操作："
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1371
 msgid "Current allowed actions: "
 msgstr "目前允许的操作："
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1376
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) 选择是否用于签名\n"
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1379
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) 选择是否用于加密\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1382
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) 选择是否用于认证\n"
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1385
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 已完成\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1441
 msgid "Please select what kind of key you want:\n"
 msgstr "请选择您要使用的密钥种类：\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1443
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA 和 ElGamal (默认)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (仅用于签名)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1446
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (自定义用途)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1448
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (仅用于加密)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (仅用于签名)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (仅用于加密)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1453
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (自定义用途)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1522
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA 密钥对会有 %u 位。\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1532
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 密钥长度应在 %u 位与 %u 位之间。\n"
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1539
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "您想要用多大的密钥尺寸？(%u)"
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1553
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n"
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1559
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "您所要求的密钥尺寸是 %u 位\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1564 g10/keygen.c:1569
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "舍入到 %u 位\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1618
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3802,7 +3807,7 @@ msgstr ""
 "      <n>m = 密钥在 n 月后过期\n"
 "      <n>y = 密钥在 n 年后过期\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1629
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3818,38 +3823,38 @@ msgstr ""
 "      <n>m = 签名在 n 月后过期\n"
 "      <n>y = 签名在 n 年后过期\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Key is valid for? (0) "
 msgstr "密钥的有效期限是？(0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1655
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "签名的有效期限是多久？(%s) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1673
 msgid "invalid value\n"
 msgstr "无效的数值\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1680
 msgid "Key does not expire at all\n"
 msgstr "密钥永远不会过期\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Signature does not expire at all\n"
 msgstr "签名永远不会过期\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1686
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "密钥于 %s 过期\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1687
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "签名于 %s 过期\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1693
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3857,11 +3862,11 @@ msgstr ""
 "您的系统无法显示 2038 年以后的日期。\n"
 "不过，它可以正确处理 2106 年之前的年份。\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1698
 msgid "Is this correct? (y/N) "
 msgstr "以上正确吗？(y/n)"
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1713
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3877,44 +3882,44 @@ msgstr ""
 "    “Heinrich Heine (Der Dichter) <[email protected]>”\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1726
 msgid "Real name: "
 msgstr "真实姓名："
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Invalid character in name\n"
 msgstr "姓名含有无效的字符\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用数字开头\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1738
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓名至少要有五个字符长\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1746
 msgid "Email address: "
 msgstr "电子邮件地址："
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1752
 msgid "Not a valid email address\n"
 msgstr "电子邮件地址无效\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1760
 msgid "Comment: "
 msgstr "注释："
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1766
 msgid "Invalid character in comment\n"
 msgstr "注释含有无效的字符\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1789
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "您正在使用‘%s’字符集。\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1795
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3925,7 +3930,7 @@ msgstr ""
 "    “%s”\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1800
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 
@@ -3940,23 +3945,23 @@ msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1826
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)？"
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)？"
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:1846
 msgid "Please correct the error first\n"
 msgstr "请先改正错误\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1886
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3964,12 +3969,12 @@ msgstr ""
 "您需要一个密码来保护您的私钥。\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:1896 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1902
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -3981,7 +3986,7 @@ msgstr ""
 "再次执行这个程序，并且使用“--edit-key”选项即可。\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:1924
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3991,50 +3996,50 @@ msgstr ""
 "我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
 "鼠标、读写硬盘之类的)，这会让随机数字发生器有更好的机会获得足够的熵数。\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2722
 msgid "Key generation canceled.\n"
 msgstr "密钥生成已取消。\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:2921 g10/keygen.c:3068
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在将公钥写至`%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:2923 g10/keygen.c:3071
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "向‘%s’写入私钥占位符\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:2926 g10/keygen.c:3074
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3057
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可写的公钥钥匙环：%s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3063
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "找不到可写的私钥钥匙环：%s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3081
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "写入公钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3088
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "写入私钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3111
 msgid "public and secret key created and signed.\n"
 msgstr "公钥和私钥已经生成并经签名。\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3122
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4042,42 +4047,42 @@ msgstr ""
 "请注意这把密钥还不能用来加密，您必须先用“--edit-key”指令\n"
 "生成用于加密的子钥。\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "生成密钥失败：%s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3197 g10/keygen.c:3326
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "注意：为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3236 g10/keygen.c:3359
 msgid "Really create? (y/N) "
 msgstr "真的要建立吗？(y/N)"
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3524
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "向卡上存储密钥时失败：%s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3571
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "不能创建备份文件‘%s’：%s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3597
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "注意：卡密钥的备份已保存到‘%s’\n"
@@ -4354,205 +4359,209 @@ msgstr "警告：无法获取 URI %s：%s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "不能解析 URI %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:239
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "加密过的会话密钥尺寸(%d)诡异\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s 加密过的会话密钥\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:300
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密码由未知的散列算法 %d 生成\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:381
 #, c-format
 msgid "public key is %s\n"
 msgstr "公钥是 %s\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:438
 msgid "public key encrypted data: good DEK\n"
 msgstr "公钥加密过的数据：完好的数据加密密钥\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:471
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "由 %u 位的 %s 密钥加密，钥匙号为 %s、生成于 %s\n"
 
-#: g10/mainproc.c:476 g10/pkclist.c:219
+#: g10/mainproc.c:475 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      “%s”\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:479
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "由 %s 密钥加密、钥匙号为 %s\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:493
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公钥解密失败：%s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:507
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "以 %lu 个密码加密\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:509
 msgid "encrypted with 1 passphrase\n"
 msgstr "以 1 个密码加密\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:540 g10/mainproc.c:562
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 为加密过的数据\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:548
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 算法不可用，试以 %s 代替\n"
 
-#: g10/mainproc.c:581
+#: g10/mainproc.c:580
 msgid "decryption okay\n"
 msgstr "解密成功\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:584
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告：报文未受到完整的保护\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:597
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告：加密过的报文已经变造！\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:603
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失败：%s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:624
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "注意：发件者要求您“只阅读不存盘”\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:626
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始文件名 =‘%.*s’\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:711
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr ""
+
+#: g10/mainproc.c:839
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "独立的吊销证书――请用“gpg --import”来应用\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1187
 msgid "no signature found\n"
 msgstr "未找到签名\n"
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1430
 msgid "signature verification suppressed\n"
 msgstr "签名验证已被抑制\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1539
 msgid "can't handle this ambiguous signature data\n"
 msgstr "无法处理这些有歧义的签名\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1550
 #, c-format
 msgid "Signature made %s\n"
 msgstr "签名建立于 %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1551
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "              使用 %s 密钥 %s\n"
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1555
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "于 %s 创建的签名，使用 %s，钥匙号 %s\n"
 
-#: g10/mainproc.c:1544
+#: g10/mainproc.c:1575
 msgid "Key available at: "
 msgstr "可用的密钥在："
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "已损坏的签名，来自于“%s”"
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "过期的签名，来自于“%s”"
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的签名，来自于“%s”"
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr "[不确定]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1797
 #, c-format
 msgid "                aka \"%s\""
 msgstr "              亦即“%s”"
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1895
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "这份签名已于 %s 过期。\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1900
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "这份签名在 %s 过期。\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1903
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s 签名，散列算法 %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr "二进制"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr "文本模式"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "无法检查签名：%s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
 msgstr "不是一份分离的签名\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:2037
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告：检测到多重签名。只检查第一个签名。\n"
 
-#: g10/mainproc.c:2013
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等级 0x%02x 的独立签名\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr "旧式(PGP 2.x)签名\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中检测到无效的根包\n"
 
@@ -4685,16 +4694,16 @@ msgstr "警告：在‘%s’里的选项于此次运行期间未被使用\n"
 msgid "directory `%s' created\n"
 msgstr "已创建目录‘%s’\n"
 
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:143
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "无法操作公钥算法 %d\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:713
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "警告：潜在不安全的对称加密会话密钥\n"
 
-#: g10/parse-packet.c:1159
+#: g10/parse-packet.c:1164
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 类别的子包设定了关键位\n"
@@ -5405,12 +5414,12 @@ msgid ""
 "unexpanded.\n"
 msgstr "警告：无法 %%-扩展首选公钥服务器 URL (太大了)。现在使用未扩展的。\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:346
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "检查已建立的签名时发生错误： %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:355
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 签名来自：“%s”\n"
@@ -5429,11 +5438,11 @@ msgstr "警告：强行使用的 %s (%d)散列算法不在收件者的首选项�
 msgid "signing:"
 msgstr "正在签名："
 
-#: g10/sign.c:1100
+#: g10/sign.c:1101
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下只能够使用 PGP 2.x 样式的密钥来做明文签名\n"
 
-#: g10/sign.c:1278
+#: g10/sign.c:1280
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s 加密将被采用\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 5fdd3e607..6487f0705 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: [email protected]\n"
-"POT-Creation-Date: 2006-12-04 15:05+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2005-07-29 09:49+0800\n"
 "Last-Translator: Jedi <[email protected]>\n"
 "Language-Team: Chinese (traditional) <[email protected]>\n"
@@ -43,10 +43,10 @@ msgstr "正在將私鑰寫至 `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
+#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -79,9 +79,9 @@ msgstr "無法讀取 `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "請注意: random_seed 檔案未被更新\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
+#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
+#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "無法建立 `%s': %s\n"
@@ -386,14 +386,14 @@ msgstr "沒有可用的 OpenPGP 卡片: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "偵測到 OpenPGP 卡片編號 %s\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
+#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "無法在批次模式中這樣做\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
+#: g10/keygen.c:1456
 msgid "Your selection? "
 msgstr "妳要選哪一個? "
 
@@ -559,8 +559,8 @@ msgstr "   (2) 加密用金鑰\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
+#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "無效的選擇.\n"
 
@@ -580,7 +580,7 @@ msgstr "私鑰部分無法取用\n"
 msgid "secret key already stored on a card\n"
 msgstr "私鑰已經存放於卡片上了\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1319 g10/keyedit.c:1351
 msgid "quit this menu"
 msgstr "離開這個選單"
 
@@ -588,7 +588,7 @@ msgstr "離開這個選單"
 msgid "show admin commands"
 msgstr "顯示管理者指令"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1322 g10/keyedit.c:1354
 msgid "show this help"
 msgstr "顯示這份線上說明"
 
@@ -640,7 +640,7 @@ msgstr "變更或解凍個人識別碼 (PIN) 的選單"
 msgid "verify the PIN and list all data"
 msgstr "驗證個人識別碼 (PIN) 並列出所有的資料"
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1457 g10/keyedit.c:1617
 msgid "Command> "
 msgstr "指令> "
 
@@ -656,7 +656,7 @@ msgstr "允許使用管理者指令\n"
 msgid "Admin commands are not allowed\n"
 msgstr "未允許使用管理者指令\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1602 g10/keyedit.c:2238
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無效的指令  (試試看 \"help\")\n"
 
@@ -711,7 +711,7 @@ msgstr "請再次輸入個人識別碼 (PIN): "
 msgid "PIN not correctly repeated; try again"
 msgstr "個人識別碼 (PIN) 再次輸入時沒有正確重複; 請再試一次"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 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,7 +721,7 @@ 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:3392 g10/keyserver.c:1705
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3386 g10/keyserver.c:1705
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -767,7 +767,7 @@ msgstr "公鑰 \"%s\" 有相對應的私鑰!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:213 g10/sign.c:1286
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
@@ -833,12 +833,12 @@ msgstr "妳不能夠將 %s 用於 %s 模式中\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已經加密給: \"%s\"\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:292
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 加密過的資料\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:296
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以未知的演算法 %d 加密過\n"
@@ -974,7 +974,7 @@ msgstr "警告: 私鑰 %s 並沒有任的何單一 SK 加總檢查\n"
 msgid "WARNING: nothing exported\n"
 msgstr "警告: 沒有匯出任何東西\n"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:379
 msgid ""
 "@Commands:\n"
 " "
@@ -982,127 +982,127 @@ msgstr ""
 "@指令:\n"
 " "
 
-#: g10/gpg.c:380
+#: g10/gpg.c:381
 msgid "|[file]|make a signature"
 msgstr "|[檔案]|建立一份簽章"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "|[file]|make a clear text signature"
 msgstr "|[檔案]|建立一份明文簽章"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:383
 msgid "make a detached signature"
 msgstr "建立一份分離式簽章"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "encrypt data"
 msgstr "加密資料"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "encryption only with symmetric cipher"
 msgstr "僅使用對稱式編密法來加密"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "decrypt data (default)"
 msgstr "資料解密 (預設)"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "verify a signature"
 msgstr "驗證某份簽章"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "list keys"
 msgstr "列出金鑰"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:394
 msgid "list keys and signatures"
 msgstr "列出金鑰和簽章"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "list and check key signatures"
 msgstr "列出並檢查金鑰簽章"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "list keys and fingerprints"
 msgstr "列出金鑰和指紋"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "list secret keys"
 msgstr "列出私鑰"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "generate a new key pair"
 msgstr "產生一份新的金鑰對"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "remove keys from the public keyring"
 msgstr "從公鑰鑰匙圈裡移去金鑰"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "remove keys from the secret keyring"
 msgstr "從私鑰鑰匙圈裡移去金鑰"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "sign a key"
 msgstr "簽署某把金鑰"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "sign a key locally"
 msgstr "僅在本地簽署某把金鑰"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:404
 msgid "sign or edit a key"
 msgstr "簽署或編輯某把金鑰"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "generate a revocation certificate"
 msgstr "產生一份撤銷憑證"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "export keys"
 msgstr "匯出金鑰"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:408
 msgid "export keys to a key server"
 msgstr "把金鑰匯出至某個金鑰伺服器上"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:409
 msgid "import keys from a key server"
 msgstr "從某個金鑰伺服器上匯入金鑰"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "search for keys on a key server"
 msgstr "在某個金鑰伺服器上搜尋金鑰"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:413
 msgid "update all keys from a keyserver"
 msgstr "從某個金鑰伺服器上更新所有的金鑰"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:417
 msgid "import/merge keys"
 msgstr "匯入/合併金鑰"
 
-#: g10/gpg.c:419
+#: g10/gpg.c:420
 msgid "print the card status"
 msgstr "列印卡片狀態"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:421
 msgid "change data on a card"
 msgstr "變更卡片上的資料"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:422
 msgid "change a card's PIN"
 msgstr "變更某張卡片的個人識別碼 (PIN)"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "update the trust database"
 msgstr "更新信任資料庫"
 
-#: g10/gpg.c:437
+#: g10/gpg.c:438
 msgid "|algo [files]|print message digests"
 msgstr "|演算法 [檔案]|印出訊息摘要"
 
-#: g10/gpg.c:441 g10/gpgv.c:71
+#: g10/gpg.c:442 g10/gpgv.c:70
 msgid ""
 "@\n"
 "Options:\n"
@@ -1112,51 +1112,51 @@ msgstr ""
 "選項:\n"
 " "
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "create ascii armored output"
 msgstr "建立以 ASCII 封裝過的輸出"
 
-#: g10/gpg.c:445
+#: g10/gpg.c:446
 msgid "|NAME|encrypt for NAME"
 msgstr "|名字|以「名字」作為加密對象"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "use this user-id to sign or decrypt"
 msgstr "使用這個使用者 ID 來簽署或解密"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:458
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
 
-#: g10/gpg.c:462
+#: g10/gpg.c:463
 msgid "use canonical text mode"
 msgstr "使用標準的文字模式"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:477
 msgid "use as output file"
 msgstr "當作輸出檔案來使用"
 
-#: g10/gpg.c:478 g10/gpgv.c:73
+#: g10/gpg.c:479 g10/gpgv.c:72
 msgid "verbose"
 msgstr "囉唆模式"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "do not make any changes"
 msgstr "不要做任何改變"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:491
 msgid "prompt before overwriting"
 msgstr "覆寫前先詢問"
 
-#: g10/gpg.c:531
+#: g10/gpg.c:532
 msgid "use strict OpenPGP behavior"
 msgstr "使用嚴謹的 OpenPGP 行為"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:533
 msgid "generate PGP 2.x compatible messages"
 msgstr "產生 PGP 2.x 相容性訊息"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 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:564
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1184,15 +1184,15 @@ msgstr ""
 " --list-keys [名字]         顯示金鑰\n"
 " --fingerprint [名字]       顯示指紋\n"
 
-#: g10/gpg.c:763 g10/gpgv.c:98
+#: g10/gpg.c:766 g10/gpgv.c:97
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "請向 <[email protected]> 回報程式瑕疵.\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:783
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1202,7 +1202,7 @@ msgstr ""
 "簽署, 檢查, 加密或解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: g10/gpg.c:794
+#: g10/gpg.c:797
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1210,566 +1210,571 @@ msgstr ""
 "\n"
 "已被支援的演算法:\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid "Pubkey: "
 msgstr "公鑰: "
 
-#: g10/gpg.c:803 g10/keyedit.c:2310
+#: g10/gpg.c:806 g10/keyedit.c:2304
 msgid "Cipher: "
 msgstr "編密法: "
 
-#: g10/gpg.c:809
+#: g10/gpg.c:812
 msgid "Hash: "
 msgstr "雜湊: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2356
+#: g10/gpg.c:818 g10/keyedit.c:2350
 msgid "Compression: "
 msgstr "壓縮: "
 
-#: g10/gpg.c:898
+#: g10/gpg.c:901
 msgid "usage: gpg [options] "
 msgstr "用法: gpg [選項] "
 
-#: g10/gpg.c:1046
+#: g10/gpg.c:1049
 msgid "conflicting commands\n"
 msgstr "指令彼此矛盾\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1067
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在群組定義 `%s' 裡找不到 = 記號\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1276
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1288
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1300
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1444
+#: g10/gpg.c:1447
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的組態項目 `%s'\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "在私鑰清單和公鑰清單間切換"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/gpg.c:1954
+#: g10/gpg.c:1957
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "請注意: 舊有的預設選項檔 `%s' 已被忽略\n"
 
-#: g10/gpg.c:1996
+#: g10/gpg.c:1999
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "請注意: 沒有預設選項檔 `%s'\n"
 
-#: g10/gpg.c:2000
+#: g10/gpg.c:2003
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "選項檔 `%s': %s\n"
 
-#: g10/gpg.c:2007
+#: g10/gpg.c:2010
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "從 `%s' 讀取選項\n"
 
-#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "請注意: 一般情況下不會用到 %s!\n"
 
-#: g10/gpg.c:2236
+#: g10/gpg.c:2239
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "編密法延伸模組 `%s' 因為權限不安全而未被載入\n"
 
-#: g10/gpg.c:2402 g10/gpg.c:2414
+#: g10/gpg.c:2405 g10/gpg.c:2417
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2494
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' 不是一個有效的字元集\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖析金鑰伺服器 URI\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 msgid "invalid keyserver options\n"
 msgstr "無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無效的匯入選項\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "無效的匯入選項\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無效的匯出選項\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "無效的匯出選項\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無效的清單選項\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 msgid "invalid list options\n"
 msgstr "無效的清單選項\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "`%s' 不是一個有效的簽章使用期限\n"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2603
 msgid "invalid verify options\n"
 msgstr "無效的驗證選項\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "無法把執行檔路徑設成 %s\n"
 
-#: g10/gpg.c:2768
+#: g10/gpg.c:2773
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:2771
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: 程式可能會傾印出核心檔!\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告: %s 會使得 %s 失效\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不被允許跟 %s 併用\n"
 
-#: g10/gpg.c:2858
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 跟 %s 放在一起沒有意義!\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2875
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "注意: %s 在本版中無法使用\n"
 
-#: g10/gpg.c:2880
+#: g10/gpg.c:2890
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
 
-#: g10/gpg.c:2894
+#: g10/gpg.c:2904
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "妳祇有在 --pgp2 模式下纔能做出分離式或明文簽章\n"
 
-#: g10/gpg.c:2900
+#: g10/gpg.c:2910
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "妳在 --pgp2 模式下時, 不能同時簽署和加密\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2916
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "啟用 --pgp2 時妳祇應該使用檔案, 而非管道\n"
 
-#: g10/gpg.c:2919
+#: g10/gpg.c:2929
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
 
-#: g10/gpg.c:2986 g10/gpg.c:3010
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所選的編密演算法無效\n"
 
-#: g10/gpg.c:2992 g10/gpg.c:3016
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
-#: g10/gpg.c:2998
+#: g10/gpg.c:3008
 msgid "selected compression algorithm is invalid\n"
 msgstr "所選的壓縮演算法無效\n"
 
-#: g10/gpg.c:3004
+#: g10/gpg.c:3014
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所選的憑證摘要演算法無效\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3029
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed 一定要大於 0\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3031
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed 一定要大於 1\n"
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3033
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3035
 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:3027
+#: g10/gpg.c:3037
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3040
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "請注意: 強烈不建議使用單純的 S2K 模式 (0)\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3044
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3051
 msgid "invalid default preferences\n"
 msgstr "無效的預設偏好\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3060
 msgid "invalid personal cipher preferences\n"
 msgstr "無效的個人編密法偏好\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3064
 msgid "invalid personal digest preferences\n"
 msgstr "無效的個人摘要偏好\n"
 
-#: g10/gpg.c:3058
+#: g10/gpg.c:3068
 msgid "invalid personal compress preferences\n"
 msgstr "無效的個人壓縮偏好\n"
 
-#: g10/gpg.c:3091
+#: g10/gpg.c:3101
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 還沒辦法跟 %s 一起運作\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3148
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "妳不該將編密演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3143
+#: g10/gpg.c:3153
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "妳不該將摘要演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3158
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "妳不該將壓縮演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信任資料庫啟始失敗: %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3271
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [檔名]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [檔名]"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3291
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' 的對稱式加密失敗: %s\n"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [檔名]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3314
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [檔名]"
 
-#: g10/gpg.c:3306
+#: g10/gpg.c:3316
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3319
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [檔名]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [檔名]"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3365
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [檔名]"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3367
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3370
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [檔名]"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [檔名]"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [檔名]"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key 使用者ID"
 
-#: g10/gpg.c:3426
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 使用者ID"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 使用者ID [指令]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [使用者ID] [鑰匙圈]"
 
-#: g10/gpg.c:3560
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "送至金鑰伺服器時失敗: %s\n"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3572
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "從金鑰伺服器接收時失敗: %s\n"
 
-#: g10/gpg.c:3564
+#: g10/gpg.c:3574
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "金鑰匯出時失敗: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3585
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "從金鑰伺服器中搜尋時失敗: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3595
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "從金鑰伺服器更新時失敗: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解開封裝失敗: %s\n"
 
-#: g10/gpg.c:3644
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "進行封裝失敗: %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "無效的 `%s' 雜湊演算法\n"
 
-#: g10/gpg.c:3854
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[檔名]"
 
-#: g10/gpg.c:3858
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "請開始鍵入妳的訊息 ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4172
 msgid "the given certification policy URL is invalid\n"
 msgstr "給定的的憑證原則 URL 無效\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4174
 msgid "the given signature policy URL is invalid\n"
 msgstr "給定的簽章原則 URL 無效\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4207
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
@@ -1792,42 +1797,42 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
 
-#: g10/getkey.c:2380 g10/keyedit.c:3712
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公鑰 %s 沒有相對應的私鑰 - 正在忽略\n"
 
-#: g10/getkey.c:2611
+#: g10/getkey.c:2614
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "正在使用次鑰 %s 來替換主鑰 %s\n"
 
-#: g10/getkey.c:2658
+#: g10/getkey.c:2661
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "金鑰 %s: 祇有私鑰而沒有公鑰 - 已跳過\n"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:73
 msgid "be somewhat more quiet"
 msgstr "盡量安靜些"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "take the keys from this keyring"
 msgstr "從這個鑰匙圈裡取用金鑰"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:76
 msgid "make timestamp conflicts only a warning"
 msgstr "僅把時間戳印矛盾視為警告"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:77
 msgid "|FD|write status info to this FD"
 msgstr "|檔案描述|把狀態資訊寫入此檔案描述"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:101
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "用法: gpgv [選項] [檔案] (或用 -h 求助)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:104
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2349,7 +2354,7 @@ msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可寫的鑰匙圈: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在寫到 `%s'\n"
@@ -2703,41 +2708,41 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "請輸入約束此簽章的網域, 若無請直接按下 [Enter].\n"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "使用者 ID \"%s\" 已經被撤銷了."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
+#: g10/keyedit.c:890 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "妳仍然想要簽署它嗎? (y/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
+#: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  無法簽署.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "使用者 ID \"%s\" 已經過期了."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "使用者 ID \"%s\" 未經自我簽署."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "使用者 ID \"%s\" 可被簽署."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 msgid "Sign it? (y/N) "
 msgstr "是否要簽署? (y/N) "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2746,11 +2751,11 @@ msgstr ""
 "\"%s\" 裡的自我簽章\n"
 "是 PGP 2.x 型態的簽章.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "妳是否想要將它升級成 OpenPGP 自我簽章? (y/N) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2759,11 +2764,11 @@ msgstr ""
 "妳目前在 \"%s\" 的簽章\n"
 "已經過期了.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "妳想要發佈一份新的簽章來取代已過期的那一個嗎? (y/N) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2772,53 +2777,53 @@ msgstr ""
 "妳目前在 \"%s\" 的簽章\n"
 "是一份本地簽章.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "妳是否想要把他升級成可以完全匯出的簽章? (y/N) "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" 已經被金鑰 %s 在本地簽署了\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" 已經被金鑰 %s 簽署了\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "妳仍然想要再次簽署它嗎? (y/N) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "沒有東西可以讓金鑰 %s 簽署\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "這把金鑰已經過期了!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "這把金鑰將在 %s 過期.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "妳想要讓妳的簽章也在同一個時候過期嗎? (Y/n) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:883
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "妳不能在 --pgp2 模式下, 拿 PGP 2.x 金鑰做出 OpenPGP 簽章.\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:885
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "這會讓這把金鑰在 PGP 2.x 模式下不可使用.\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:910
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2827,31 +2832,31 @@ msgstr ""
 "妳有多謹慎檢查正要簽署的金鑰確實屬於上面那個人的名字呢?\n"
 "如果妳不知道這個問題的答案, 請輸入 \"0\".\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) 我不作答.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) 我根本沒有檢查過.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) 我隨意檢查過了.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) 我非常小心地檢查過了.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:927
 msgid "Your selection? (enter `?' for more information): "
 msgstr "妳的選擇是? (輸入 `?' 以取得更多資訊): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:951
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2860,74 +2865,74 @@ msgstr ""
 "妳真的確定要用妳的金鑰 \"%s\" (%s)\n"
 "來簽署這把金鑰嗎\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:958
 msgid "This will be a self-signature.\n"
 msgstr "這將會是一份自我簽章.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:964
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "警告: 這份簽章不會被標記為不可匯出.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:972
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "警告: 這份簽章不會被標記成不可撤銷.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:982
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "這份簽章會被標記成不可匯出.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:989
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "這份簽章會被標記成不可撤銷.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:996
 msgid "I have not checked this key at all.\n"
 msgstr "我根本沒有檢查過這把金鑰.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1001
 msgid "I have checked this key casually.\n"
 msgstr "我隨意檢查過這把金鑰了.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1006
 msgid "I have checked this key very carefully.\n"
 msgstr "我非常小心地檢查過這把金鑰了.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1016
 msgid "Really sign? (y/N) "
 msgstr "真的要簽署嗎? (y/N)"
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
-#: g10/keyedit.c:5004 g10/sign.c:352
+#: g10/keyedit.c:1061 g10/keyedit.c:4793 g10/keyedit.c:4884 g10/keyedit.c:4948
+#: g10/keyedit.c:5009 g10/sign.c:351
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "簽署時失敗了: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1126
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "金鑰祇剩下殘骸或者祇含有卡上 (on-card) 金鑰項目 - 沒有可變更的密語.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1137 g10/keygen.c:3215
 msgid "This key is not protected.\n"
 msgstr "這把金鑰沒有被保護.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主鑰的私鑰部分沒辦法取用.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1145 g10/keygen.c:3218
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主鑰的私鑰部分存放於卡上 (on-card).\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1149 g10/keygen.c:3222
 msgid "Key is protected.\n"
 msgstr "金鑰被保護了.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1173
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "無法編輯這把金鑰: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1179
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2935,11 +2940,11 @@ msgstr ""
 "輸入要給這把私鑰用的新密語.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1188 g10/keygen.c:1895
 msgid "passphrase not correctly repeated; try again"
 msgstr "密語再次輸入時沒有正確重複; 請再試一次"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1193
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2947,186 +2952,186 @@ msgstr ""
 "妳不想要用密語 - 這大概是個 *糟* 點子!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1196
 msgid "Do you really want to do this? (y/N) "
 msgstr "妳真的想要這麼做嗎? (y/N) "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1267
 msgid "moving a key signature to the correct place\n"
 msgstr "正在把金鑰的簽章搬移到正確的位置去\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1353
 msgid "save and quit"
 msgstr "儲存並離開"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1356
 msgid "show key fingerprint"
 msgstr "顯示金鑰指紋"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1357
 msgid "list key and user IDs"
 msgstr "列出金鑰和使用者 ID"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1359
 msgid "select user ID N"
 msgstr "使用者 ID 選了 N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1360
 msgid "select subkey N"
 msgstr "選擇次鑰 N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1361
 msgid "check signatures"
 msgstr "檢查簽章"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1366
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "簽署所選的使用者 ID [* 請參見底下有關的註解]"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs locally"
 msgstr "僅在本地簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a trust signature"
 msgstr "用信任簽章來簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "用不可撤銷的簽章來簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1379
 msgid "add a user ID"
 msgstr "增加一個使用者 ID"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1381
 msgid "add a photo ID"
 msgstr "增加一個照片 ID"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1383
 msgid "delete selected user IDs"
 msgstr "刪除所選的使用者 ID"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1388
 msgid "add a subkey"
 msgstr "增加一把次鑰"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1392
 msgid "add a key to a smartcard"
 msgstr "加入某把金鑰至智慧卡"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1394
 msgid "move a key to a smartcard"
 msgstr "移動某把金鑰至智慧卡"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1396
 msgid "move a backup key to a smartcard"
 msgstr "移動某把備份金鑰至智慧卡"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1400
 msgid "delete selected subkeys"
 msgstr "刪除所選的次鑰"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1402
 msgid "add a revocation key"
 msgstr "增加一把撤銷金鑰"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1404
 msgid "delete signatures from the selected user IDs"
 msgstr "從所選的使用者 ID 中刪除簽章"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1406
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "從金鑰或所選的次鑰中變更使用期限"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1408
 msgid "flag the selected user ID as primary"
 msgstr "把所選的使用者 ID 標為主要"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1410
 msgid "toggle between the secret and public key listings"
 msgstr "在私鑰清單和公鑰清單間切換"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1413
 msgid "list preferences (expert)"
 msgstr "列出偏好 (專家模式)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1415
 msgid "list preferences (verbose)"
 msgstr "列出偏好 (囉唆模式)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1417
 msgid "set preference list for the selected user IDs"
 msgstr "設定所選使用者 ID 的偏好清單"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "設定所選使用者 ID 的偏好金鑰伺服器 URL"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "設定所選使用者 ID 的偏好清單"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "更改密語"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "更改主觀信任"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1432
 msgid "revoke signatures on the selected user IDs"
 msgstr "從所選的使用者 ID 上撤銷簽章"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1434
 msgid "revoke selected user IDs"
 msgstr "撤銷所選的使用者 ID"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1439
 msgid "revoke key or selected subkeys"
 msgstr "撤銷金鑰或所選的次鑰"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1440
 msgid "enable key"
 msgstr "啟用金鑰"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1441
 msgid "disable key"
 msgstr "禁用金鑰"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1442
 msgid "show selected photo IDs"
 msgstr "顯示所選的照片 ID"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1446
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1564
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "讀取私鑰區塊 \"%s\" 時出錯: %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1582
 msgid "Secret key is available.\n"
 msgstr "私鑰可用.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1663
 msgid "Need the secret key to do this.\n"
 msgstr "要有私鑰纔能這麼做.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1671
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "請先使用 \"toggle\" 指令.\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1690
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3137,154 +3142,154 @@ msgstr ""
 "  加上 `t' 的話就是信任簽章 (tsign), 加上 `nr' 的話就是不可撤銷簽章\n"
 "  (nrsign), 當然也可以任意組合這些選項 (像是 ltsign, tnrsign 等等.).\n"
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1730
 msgid "Key is revoked."
 msgstr "金鑰已經被撤銷了."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1749
 msgid "Really sign all user IDs? (y/N) "
 msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1756
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "提示: 選擇使用者 ID 來加以簽署\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1765
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "未知的簽章種類 `%s'\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1788
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模式中不允許使用這個指令.\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
 msgid "You must select at least one user ID.\n"
 msgstr "妳至少得選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1812
 msgid "You can't delete the last user ID!\n"
 msgstr "妳不能刪除最後一個使用者 ID!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1814
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "真的要移除所有被選擇的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1815
 msgid "Really remove this user ID? (y/N) "
 msgstr "真的要移除這個使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1865
 msgid "Really move the primary key? (y/N) "
 msgstr "真的要移動主要金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1877
 msgid "You must select exactly one key.\n"
 msgstr "妳一定祇得選擇一把金鑰.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1905
 msgid "Command expects a filename argument\n"
 msgstr "這項指令應該要拿一個檔名當作參數\n"
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1919
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1936
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "從 `%s' 讀取備份金鑰時發生錯誤: %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1960
 msgid "You must select at least one key.\n"
 msgstr "妳至少必須選擇一把金鑰.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1963
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "妳真的想要刪除被選擇的金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1964
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "妳真的要刪除這把金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:1999
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "真的要撤銷所有被選擇的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2000
 msgid "Really revoke this user ID? (y/N) "
 msgstr "真的要撤銷這個使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2018
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "妳真的想要撤銷這整把金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2029
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "妳真的想要撤銷這些被選擇的次鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2031
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "妳真的想要撤銷這把次鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2081
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr "使用使用者所提供的信任資料庫時可能無法設定主觀信任\n"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2123
 msgid "Set preference list to:\n"
 msgstr "設定偏好清單至:\n"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2129
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "真的要更新所選使用者 ID 的偏好嗎? (y/N) "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2131
 msgid "Really update the preferences? (y/N) "
 msgstr "真的要更新偏好嗎? (y/N) "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2199
 msgid "Save changes? (y/N) "
 msgstr "要儲存變更嗎? (y/N) "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2202
 msgid "Quit without saving? (y/N) "
 msgstr "要不儲存就離開嗎? (y/N) "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2212
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "更新私鑰失敗: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2226
 msgid "Key not changed so no update needed.\n"
 msgstr "金鑰沒有變更所以不需要更新.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2327
 msgid "Digest: "
 msgstr "摘要: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2379
 msgid "Features: "
 msgstr "特點: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2390
 msgid "Keyserver no-modify"
 msgstr "金鑰伺服器無修改"
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2405 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "偏好的金鑰伺服器: "
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2413 g10/keyedit.c:2414
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3292,73 +3297,73 @@ msgstr ""
 "選項:\n"
 " "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2624
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 型態的使用者 ID 沒有偏好.\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2683
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "這把金鑰已經在 %s 時被 %s 金鑰 %s 給撤銷了\n"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2704
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "這把金鑰可能被 %s 金鑰 %s 撤銷了 "
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2710
 msgid "(sensitive)"
 msgstr "(機密的)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
+#: g10/keyedit.c:2726 g10/keyedit.c:2782 g10/keyedit.c:2843 g10/keyedit.c:2858
 #: g10/keylist.c:194 g10/keyserver.c:511
 #, c-format
 msgid "created: %s"
 msgstr "建立於: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2729 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
 #, c-format
 msgid "revoked: %s"
 msgstr "已撤銷: %s"
 
 #  of subkey
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2731 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "已過期: %s"
 
 #  of subkey
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2733 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
 #, c-format
 msgid "expires: %s"
 msgstr "過期: %s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2735
 #, c-format
 msgid "usage: %s"
 msgstr "用法: %s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2750
 #, c-format
 msgid "trust: %s"
 msgstr "信任: %s"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2754
 #, c-format
 msgid "validity: %s"
 msgstr "有效性: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2761
 msgid "This key has been disabled"
 msgstr "這把金鑰已經被禁用了"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2789 g10/keylist.c:200
 msgid "card-no: "
 msgstr "卡片編號: "
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2813
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3366,17 +3371,17 @@ msgstr ""
 "請注意顯示出來的金鑰有效性不需要更正,\n"
 "除非妳重新執行程式.\n"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "已撤銷"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "已過期"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2944
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3384,7 +3389,7 @@ msgstr ""
 "警告: 沒有任何使用者 ID 已被標示為主要 ID. 這項指令可能\n"
 "      會導致不同的使用者 ID 被當成主要 ID.\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3005
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3393,74 +3398,74 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3351
+#: g10/keyedit.c:3010 g10/keyedit.c:3345
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "妳確定仍然想要增加嗎? (y/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3016
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "妳不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3156
 msgid "Delete this good signature? (y/N/q)"
 msgstr "刪除這個完好的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3166
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "刪除這個無效的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3170
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "刪除這個未知的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3176
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要刪除這個自我簽章嗎? (y/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3190
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已經刪除了 %d 個簽章.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3191
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已經刪除了 %d 個簽章.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3194
 msgid "Nothing deleted.\n"
 msgstr "沒有東西被刪除.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3227 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "無效"
 
-#: g10/keyedit.c:3235
+#: g10/keyedit.c:3229
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "使用者 ID \"%s\": 已經是乾淨的了.\n"
 
-#: g10/keyedit.c:3242
+#: g10/keyedit.c:3236
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3237
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "使用者 ID \"%s\": 已經是乾淨的了.\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3246
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "使用者 ID \"%s\": 已經是乾淨的了.\n"
 
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3340
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3469,360 +3474,360 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加指定撤銷者可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3351
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "妳不可以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3371
 msgid "Enter the user ID of the designated revoker: "
 msgstr "輸入指定撤銷者的使用者 ID: "
 
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3396
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "無法將 PGP 2.x 型態的金鑰指派為指定撤銷者\n"
 
 #  This actually causes no harm (after all, a key that
 #  designates itself as a revoker is the same as a
 #  regular key), but it's easy enough to check.
-#: g10/keyedit.c:3417
+#: g10/keyedit.c:3411
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "妳不能指派某把金鑰為它自己的指定撤銷者\n"
 
-#: g10/keyedit.c:3439
+#: g10/keyedit.c:3433
 msgid "this key has already been designated as a revoker\n"
 msgstr "這把金鑰已被指定為撤銷者了\n"
 
-#: g10/keyedit.c:3458
+#: g10/keyedit.c:3452
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
 
-#: g10/keyedit.c:3464
+#: g10/keyedit.c:3458
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "妳確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
 
-#: g10/keyedit.c:3525
+#: g10/keyedit.c:3520
 msgid "Please remove selections from the secret keys.\n"
 msgstr "請從私鑰中移除選擇.\n"
 
-#: g10/keyedit.c:3531
+#: g10/keyedit.c:3526
 msgid "Please select at most one subkey.\n"
 msgstr "請至多選擇一把次鑰.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3530
 msgid "Changing expiration time for a subkey.\n"
 msgstr "正在變更某把次鑰的使用期限.\n"
 
-#: g10/keyedit.c:3538
+#: g10/keyedit.c:3533
 msgid "Changing expiration time for the primary key.\n"
 msgstr "正在變更主鑰的使用期限.\n"
 
-#: g10/keyedit.c:3584
+#: g10/keyedit.c:3582
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "妳不能變更 v3 金鑰的使用期限\n"
 
-#: g10/keyedit.c:3600
+#: g10/keyedit.c:3598
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3678
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "警告: 正要簽署的子鑰 %s 未經交叉認證\n"
 
-#: g10/keyedit.c:3679
+#: g10/keyedit.c:3684
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3841
+#: g10/keyedit.c:3846
 msgid "Please select exactly one user ID.\n"
 msgstr "請精確地選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
+#: g10/keyedit.c:3885 g10/keyedit.c:3995 g10/keyedit.c:4115 g10/keyedit.c:4256
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
 
-#: g10/keyedit.c:4051
+#: g10/keyedit.c:4056
 msgid "Enter your preferred keyserver URL: "
 msgstr "請輸入妳的偏好金鑰伺服器 URL: "
 
-#: g10/keyedit.c:4131
+#: g10/keyedit.c:4136
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "妳確定要取代它嗎？ (y/N) "
 
-#: g10/keyedit.c:4132
+#: g10/keyedit.c:4137
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "妳確定要刪除它嗎？ (y/N) "
 
-#: g10/keyedit.c:4194
+#: g10/keyedit.c:4199
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "簽章標記: "
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4348
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "是否覆寫? (y/N) "
 
-#: g10/keyedit.c:4407
+#: g10/keyedit.c:4412
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "索引 %d 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4470
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "雜湊 %s 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:4492
+#: g10/keyedit.c:4497
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "索引 %d 沒有對應到次鑰\n"
 
-#: g10/keyedit.c:4627
+#: g10/keyedit.c:4632
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "使用者 ID: \"%s\"\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4635 g10/keyedit.c:4699 g10/keyedit.c:4742
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "已被妳的金鑰 %s 於 %s%s%s 簽署了\n"
 
-#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 msgid " (non-exportable)"
 msgstr " (不可匯出)"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4641
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "這份簽署已經在 %s 過期了.\n"
 
-#: g10/keyedit.c:4640
+#: g10/keyedit.c:4645
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "妳確定妳仍然想要撤銷它嗎? (y/N) "
 
-#: g10/keyedit.c:4644
+#: g10/keyedit.c:4649
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要為這份簽章建立一份撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:4671
+#: g10/keyedit.c:4676
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "妳已經簽署了金鑰 %s 上的這些使用者 ID:\n"
 
-#: g10/keyedit.c:4697
+#: g10/keyedit.c:4702
 msgid " (non-revocable)"
 msgstr " (不可撤銷)"
 
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4709
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "被妳的金鑰 %s 於 %s 所撤銷了\n"
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4731
 msgid "You are about to revoke these signatures:\n"
 msgstr "妳正在撤銷這些簽章:\n"
 
-#: g10/keyedit.c:4746
+#: g10/keyedit.c:4751
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要建立撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:4776
+#: g10/keyedit.c:4781
 msgid "no secret key\n"
 msgstr "沒有私鑰\n"
 
-#: g10/keyedit.c:4846
+#: g10/keyedit.c:4851
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "使用者 ID \"%s\" 已經被撤銷了\n"
 
-#: g10/keyedit.c:4863
+#: g10/keyedit.c:4868
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告: 有一份使用者 ID 簽章的日期標記為 %d 秒後的未來\n"
 
-#: g10/keyedit.c:4927
+#: g10/keyedit.c:4932
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "金鑰 %s 已經被撤銷了.\n"
 
-#: g10/keyedit.c:4989
+#: g10/keyedit.c:4994
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "次鑰 %s 已經被撤銷了.\n"
 
-#: g10/keyedit.c:5084
+#: g10/keyedit.c:5089
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "偏好設定 `%s' 重複了\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 msgid "too many cipher preferences\n"
 msgstr "編密偏好過多\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 msgid "too many digest preferences\n"
 msgstr "摘要偏好過多\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 msgid "too many compression preferences\n"
 msgstr "壓縮偏好過多\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "偏好字串中含有無效的 `%s' 項目\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:876
 msgid "writing direct signature\n"
 msgstr "正在寫入直接簽章\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:915
 msgid "writing self signature\n"
 msgstr "正在寫入自我簽章\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:965
 msgid "writing key binding signature\n"
 msgstr "正在寫入附鑰簽章\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
+#: g10/keygen.c:2776
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "金鑰尺寸無效; 改用 %u 位元\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "金鑰尺寸增大到 %u 位元\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1331
 msgid "Sign"
 msgstr "簽署"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1334
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1337
 msgid "Encrypt"
 msgstr "加密"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1340
 msgid "Authenticate"
 msgstr "鑑定"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1348
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1367
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "%s 金鑰可能的動作: "
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1371
 msgid "Current allowed actions: "
 msgstr "目前可進行的動作: "
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1376
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) 切換簽署性能\n"
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1379
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) 切換加密性能\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1382
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) 切換鑑定性能\n"
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1385
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 已完成\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1441
 msgid "Please select what kind of key you want:\n"
 msgstr "請選擇妳要使用的金鑰種類:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1443
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA 和 Elgamal (預設)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (僅能簽署用)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1446
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (妳自己設定性能)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1448
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (僅能加密用)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (僅能簽署用)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (僅能加密用)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1453
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (妳自己設定性能)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1522
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA 金鑰對會有 %u 位元長.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1532
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 金鑰的長度可能介於 %u 位元和 %u 位元之間.\n"
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1539
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "妳想要用多大的金鑰尺寸? (%u) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1553
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s 金鑰尺寸一定要介於 %u 到 %u 之間\n"
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1559
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "妳所要求的金鑰尺寸是 %u 位元\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1564 g10/keygen.c:1569
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "加大到 %u 位元\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1618
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3838,7 +3843,7 @@ msgstr ""
 "      <n>m = 金鑰在 n 月後會過期\n"
 "      <n>y = 金鑰在 n 年後會過期\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1629
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3854,38 +3859,38 @@ msgstr ""
 "      <n>m = 簽章在 n 月後會過期\n"
 "      <n>y = 簽章在 n 年後會過期\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
 msgid "Key is valid for? (0) "
 msgstr "金鑰的有效期限是多久? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1655
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "簽章的有效期限是多久? (%s) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1673
 msgid "invalid value\n"
 msgstr "無效的數值\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1680
 msgid "Key does not expire at all\n"
 msgstr "金鑰完全不會過期\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
 msgid "Signature does not expire at all\n"
 msgstr "簽章完全不會過期\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1686
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "金鑰將會在 %s 過期\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1687
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "簽章將會在 %s 過期.\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1693
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3893,11 +3898,11 @@ msgstr ""
 "妳的系統無法顯示 2038 年以後的日期.\n"
 "不過, 它可以正確處理直到 2106 年之前的年份.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1698
 msgid "Is this correct? (y/N) "
 msgstr "以上正確嗎? (y/N) "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1713
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3912,44 +3917,44 @@ msgstr ""
 "    \"Ke-Huan Lin (Jedi) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1726
 msgid "Real name: "
 msgstr "真實姓名: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Invalid character in name\n"
 msgstr "姓名含有無效的字符\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用數字開頭\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1738
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓名至少要有五個字符長\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1746
 msgid "Email address: "
 msgstr "電子郵件地址: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1752
 msgid "Not a valid email address\n"
 msgstr "不是有效的電子郵件地址\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1760
 msgid "Comment: "
 msgstr "註釋: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1766
 msgid "Invalid character in comment\n"
 msgstr "註釋含有無效的字符\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1789
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "妳正在使用 `%s' 字元集.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1795
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3960,7 +3965,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1800
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "請不要把電子郵件地址放進妳的真實姓名或註釋裡\n"
 
@@ -3975,23 +3980,23 @@ msgstr "請不要把電子郵件地址放進妳的真實姓名或註釋裡\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1826
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或退出(Q)? "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)? "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:1846
 msgid "Please correct the error first\n"
 msgstr "請先訂正錯誤\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1886
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3999,12 +4004,12 @@ msgstr ""
 "妳需要一個密語來保護妳的私鑰.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:1896 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1902
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4016,7 +4021,7 @@ msgstr ""
 "僅需要再次執行這個程式, 並且使用 \"--edit-key\" 選項即可.\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:1924
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4027,50 +4032,50 @@ msgstr ""
 "(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
 "這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2722
 msgid "Key generation canceled.\n"
 msgstr "已取消金鑰產生.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:2921 g10/keygen.c:3068
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在將公鑰寫至 `%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:2923 g10/keygen.c:3071
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "正在寫入私鑰 stub 至 `%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:2926 g10/keygen.c:3074
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在將私鑰寫至 `%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3057
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可寫的公鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3063
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "找不到可寫的私鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3081
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "寫入公鑰鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3088
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "寫入私鑰鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3111
 msgid "public and secret key created and signed.\n"
 msgstr "公鑰和私鑰已經被建立及簽署了.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3122
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4078,42 +4083,42 @@ msgstr ""
 "請注意這把金鑰不能用於加密之用.  也許妳會想藉由 \"--edit-key\" \n"
 "指令來產生加密用的次鑰.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "產生金鑰失敗: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3197 g10/keygen.c:3326
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "請注意: 對 v3 金鑰製造子鑰會失去 OpenPGP 相容性\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3236 g10/keygen.c:3359
 msgid "Really create? (y/N) "
 msgstr "真的要建立嗎? (y/N) "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3524
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "儲存金鑰到卡片上時失敗: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3571
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "無法建立備份檔案 `%s': %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3597
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "請注意: 卡片金鑰的備份已儲存至 `%s'\n"
@@ -4391,207 +4396,211 @@ msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:239
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "加密過的階段金鑰 (%d) 尺寸詭異\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s 加密過的階段金鑰\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:300
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密語係以未知的摘要演算法 %d 所產生\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:381
 #, c-format
 msgid "public key is %s\n"
 msgstr "公鑰為 %s\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:438
 msgid "public key encrypted data: good DEK\n"
 msgstr "公鑰加密過的資料: 完好的 DEK\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:471
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "已用 %u 位元長的 %s 金鑰,  ID %s, 建立於 %s 加密了\n"
 
-#: g10/mainproc.c:476 g10/pkclist.c:219
+#: g10/mainproc.c:475 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:479
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "已用 %s 金鑰, ID %s 加密了\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:493
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公鑰解密失敗: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:507
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "已用 %lu 個密語加密了\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:509
 msgid "encrypted with 1 passphrase\n"
 msgstr "已用 1 個密語加密了\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:540 g10/mainproc.c:562
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 為加密過的資料\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:548
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 編密法不可用, 我們樂觀地試著改以 %s 代替\n"
 
-#: g10/mainproc.c:581
+#: g10/mainproc.c:580
 msgid "decryption okay\n"
 msgstr "解密成功\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:584
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告: 訊息未受到完整的保護\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:597
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告: 加密過的訊息已經被變造了!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:603
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失敗: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:624
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "請注意: 寄件者要求了 \"妳應該祇用眼睛看\"\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:626
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始的檔名 ='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:711
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr ""
+
+#: g10/mainproc.c:839
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "獨立撤銷 - 請用 \"gpg --import\" 來套用\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1187
 #, fuzzy
 msgid "no signature found\n"
 msgstr "完好的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1430
 msgid "signature verification suppressed\n"
 msgstr "簽章驗證已被抑制\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1539
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "無法處理這些多重簽章\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1550
 #, c-format
 msgid "Signature made %s\n"
 msgstr "由 %s 建立的簽章\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1551
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               使用 %s 金鑰 %s\n"
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1555
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
 
-#: g10/mainproc.c:1544
+#: g10/mainproc.c:1575
 msgid "Key available at: "
 msgstr "可用的金鑰於: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "*損壞* 的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "過期的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr "[ 不確定 ]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1797
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                亦即 \"%s\""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1895
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "這份簽署已經在 %s 過期了\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1900
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "這份簽署在 %s 過期\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1903
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s 簽章, 摘要演算法 %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr "二進制"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr "文字模式"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "無法檢查簽章: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
 msgstr "不是一份分離的簽章\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:2037
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
 
-#: g10/mainproc.c:2013
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等級 0x%02x 的獨立簽章\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr "舊型 (PGP 2.x) 簽章\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中偵測到無效的 root 封包\n"
 
@@ -4724,16 +4733,16 @@ msgstr "警告: 在 `%s' 裡的選項於這次執行期間並沒有被啟用\n"
 msgid "directory `%s' created\n"
 msgstr "目錄 `%s' 已建立\n"
 
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:143
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "無法操作公開金鑰演算法 %d\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:713
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "警告: 以可能並不安全的對稱式加密過的階段金鑰\n"
 
-#: g10/parse-packet.c:1159
+#: g10/parse-packet.c:1164
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 類別的子封包設定了關鍵位元\n"
@@ -5451,12 +5460,12 @@ msgid ""
 "unexpanded.\n"
 msgstr "警告: 偏好金鑰伺服器 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:346
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "檢查已建立的簽章時發生錯誤: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:355
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 簽章來自: \"%s\"\n"
@@ -5475,11 +5484,11 @@ msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設�
 msgid "signing:"
 msgstr "簽署:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1101
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "妳在 --pgp2 模式下祇能夠使用 PGP 2.x 型態的金鑰來做明文簽署\n"
 
-#: g10/sign.c:1278
+#: g10/sign.c:1280
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s 加密將被採用\n"