Implemented the chain model for X.509 validation.

60 files changed, 16650 insertions, 12279 deletions

diff --git a/ChangeLog b/ChangeLog
index 9d891125e..3b0d1f4f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-08  Werner Koch  <wk@g10code.com>
+
+	* configure.ac: Use AC_CANONICAL_HOST and not AC_CANONICAL_TARGET.
+
 2007-07-09  Werner Koch  <wk@g10code.com>
 
 	* configure.ac (AM_ICONV): Check for it even when building without
diff --git a/NEWS b/NEWS
index c69879dc2..755e2cfba 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,14 @@
 Noteworthy changes in version 2.0.6
 ------------------------------------------------
 
- * gpgsm does now grok --default-key.
- 
- * gpgconf is now aware of --default-key and --encrypt-to. 
+ * GPGSM does now grok --default-key.
+
+ * GPGCONF is now aware of --default-key and --encrypt-to. 
 
+ * GPGSM does again correctly print the serial number as well the the
+   various keyids.  This was broken since 2.0.4.
 
+ 
 Noteworthy changes in version 2.0.5 (2007-07-05)
 ------------------------------------------------
 
diff --git a/agent/ChangeLog b/agent/ChangeLog
index 05dd9a830..dac47fdc1 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-06  Werner Koch  <wk@g10code.com>
+
+	* trustlist.c (read_one_trustfile): Add flag "cm".
+	(agent_istrusted): Ditto.
+
 2007-08-02  Werner Koch  <wk@g10code.com>
 
 	* gpg-agent.c: Include gc-opt-flags.h and remove their definition
diff --git a/agent/trustlist.c b/agent/trustlist.c
index d3c409b0b..deb0d95cd 100644
--- a/agent/trustlist.c
+++ b/agent/trustlist.c
@@ -1,5 +1,5 @@
 /* trustlist.c - Maintain the list of trusted keys
- *	Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
+ * Copyright (C) 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -42,6 +42,7 @@ struct trustitem_s
     int for_smime:1;      /* Set by '*' or 'S' as first flag. */
     int relax:1;          /* Relax checking of root certificate
                              constraints. */
+    int cm:1;             /* Use chain model for validation. */
   } flags;
   unsigned char fpr[20];  /* The binary fingerprint. */
 };
@@ -267,6 +268,8 @@ read_one_trustfile (const char *fname, int allow_include,
             }
           else if (n == 5 && !memcmp (p, "relax", 5))
             ti->flags.relax = 1;
+          else if (n == 2 && !memcmp (p, "cm", 2))
+            ti->flags.cm = 1;
           else
             log_error ("flag `%.*s' in `%s', line %d ignored\n",
                        n, p, fname, lnr);
@@ -396,6 +399,14 @@ agent_istrusted (ctrl_t ctrl, const char *fpr)
                 if (err)
                   return err;
               }
+            else if (ti->flags.cm)
+              {
+                err = agent_write_status (ctrl,
+                                          "TRUSTLISTFLAG", "cm", 
+                                          NULL);
+                if (err)
+                  return err;
+              }
             return 0; /* Trusted. */
           }
     }
diff --git a/common/ChangeLog b/common/ChangeLog
index d3f55066d..f963e5282 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-07  Werner Koch  <wk@g10code.com>
+
+	* tlv.c, tlv.h: Move from ../scd/.
+	* tlv.c (parse_sexp, parse_ber_header): Add ERRSOURCE arg and prefix
+	name with a _.
+	* tlv.h: Use macro to convey ERRSOURCE.
+
 2007-08-02  Werner Koch  <wk@g10code.com>
 
 	* gc-opt-flags.h: New.
@@ -29,7 +36,7 @@
 
 2007-07-04  Werner Koch  <wk@g10code.com>
 
-	* estream.c (es_init_do): Do not throw an error if pth as already
+	* estream.c (es_init_do): Do not throw an error if pth has already
 	been initialized.
 
 2007-06-26  Werner Koch  <wk@g10code.com>
diff --git a/common/Makefile.am b/common/Makefile.am
index 0ce11f188..fc0c357d9 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -36,6 +36,7 @@ common_sources = \
 	gc-opt-flags.h \
 	keyserver.h \
 	sexp-parse.h \
+	tlv.c tlv.h \
 	init.c init.h \
 	sexputil.c \
 	sysutils.c sysutils.h \
diff --git a/common/gettime.c b/common/gettime.c
index 56ff40eec..1814826c0 100644
--- a/common/gettime.c
+++ b/common/gettime.c
@@ -72,10 +72,10 @@ gnupg_get_isotime (gnupg_isotime_t timebuf)
 }
 
 
-/* set the time to NEWTIME so that gnupg_get_time returns a time
+/* Set the time to NEWTIME so that gnupg_get_time returns a time
    starting with this one.  With FREEZE set to 1 the returned time
    will never change.  Just for completeness, a value of (time_t)-1
-   for NEWTIME gets you back to rality. Note that this is obviously
+   for NEWTIME gets you back to reality.  Note that this is obviously
    not thread-safe but this is not required. */
 void
 gnupg_set_time (time_t newtime, int freeze)
@@ -165,7 +165,7 @@ scan_isodatestr( const char *string )
     return stamp;
 }
 
-/* Scan am ISO timestamp and return a epoch based timestamp.  The only
+/* Scan am ISO timestamp and return an Epoch based timestamp.  The only
    supported format is "yyyymmddThhmmss" delimited by white space, nul, a
    colon or a comma.  Returns (time_t)(-1) for an invalid string.  */
 time_t
diff --git a/scd/tlv.c b/common/tlv.c
index e665f9087..c68756406 100644
--- a/scd/tlv.c
+++ b/common/tlv.c
@@ -29,7 +29,7 @@
 #define GPG_ERR_BAD_BER           (1)  /*G10ERR_GENERAL*/
 #define GPG_ERR_INV_SEXP          (45) /*G10ERR_INV_ARG*/
 typedef int gpg_error_t;
-#define gpg_error(n) (n)
+#define gpg_make_err(x,n) (n)
 #else
 #include <gpg-error.h>
 #endif
@@ -151,10 +151,11 @@ find_tlv_unchecked (const unsigned char *buffer, size_t length,
    and the length part from the TLV triplet.  Update BUFFER and SIZE
    on success. */
 gpg_error_t
-parse_ber_header (unsigned char const **buffer, size_t *size,
-                  int *r_class, int *r_tag, 
-                  int *r_constructed, int *r_ndef,
-                  size_t *r_length, size_t *r_nhdr)
+_parse_ber_header (unsigned char const **buffer, size_t *size,
+                   int *r_class, int *r_tag, 
+                   int *r_constructed, int *r_ndef,
+                   size_t *r_length, size_t *r_nhdr,
+                   gpg_err_source_t errsource)
 {
   int c;
   unsigned long tag;
@@ -167,7 +168,7 @@ parse_ber_header (unsigned char const **buffer, size_t *size,
 
   /* Get the tag. */
   if (!length)
-    return gpg_error (GPG_ERR_EOF);
+    return gpg_err_make (errsource, GPG_ERR_EOF);
   c = *buf++; length--; ++*r_nhdr;
 
   *r_class = (c & 0xc0) >> 6;
@@ -181,7 +182,7 @@ parse_ber_header (unsigned char const **buffer, size_t *size,
         {
           tag <<= 7;
           if (!length)
-            return gpg_error (GPG_ERR_EOF);
+            return gpg_err_make (errsource, GPG_ERR_EOF);
           c = *buf++; length--; ++*r_nhdr;
           tag |= c & 0x7f;
 
@@ -192,7 +193,7 @@ parse_ber_header (unsigned char const **buffer, size_t *size,
 
   /* Get the length. */
   if (!length)
-    return gpg_error (GPG_ERR_EOF);
+    return gpg_err_make (errsource, GPG_ERR_EOF);
   c = *buf++; length--; ++*r_nhdr;
 
   if ( !(c & 0x80) )
@@ -200,20 +201,20 @@ parse_ber_header (unsigned char const **buffer, size_t *size,
   else if (c == 0x80)
     *r_ndef = 1;
   else if (c == 0xff)
-    return gpg_error (GPG_ERR_BAD_BER);
+    return gpg_err_make (errsource, GPG_ERR_BAD_BER);
   else
     {
       unsigned long len = 0;
       int count = c & 0x7f;
 
       if (count > sizeof (len) || count > sizeof (size_t))
-        return gpg_error (GPG_ERR_BAD_BER);
+        return gpg_err_make (errsource, GPG_ERR_BAD_BER);
 
       for (; count; count--)
         {
           len <<= 8;
           if (!length)
-            return gpg_error (GPG_ERR_EOF);
+            return gpg_err_make (errsource, GPG_ERR_EOF);
           c = *buf++; length--; ++*r_nhdr;
           len |= c & 0xff;
         }
@@ -254,8 +255,9 @@ parse_ber_header (unsigned char const **buffer, size_t *size,
      handle_error ();
  */
 gpg_error_t
-parse_sexp (unsigned char const **buf, size_t *buflen,
-            int *depth, unsigned char const **tok, size_t *toklen)
+_parse_sexp (unsigned char const **buf, size_t *buflen,
+             int *depth, unsigned char const **tok, size_t *toklen,
+             gpg_err_source_t errsource)
 {
   const unsigned char *s;
   size_t n, vlen;
@@ -265,7 +267,7 @@ parse_sexp (unsigned char const **buf, size_t *buflen,
   *tok = NULL;
   *toklen = 0;
   if (!n)
-    return *depth ? gpg_error (GPG_ERR_INV_SEXP) : 0;
+    return *depth ? gpg_err_make (errsource, GPG_ERR_INV_SEXP) : 0;
   if (*s == '(')
     {
       s++; n--;
@@ -277,7 +279,7 @@ parse_sexp (unsigned char const **buf, size_t *buflen,
   if (*s == ')')
     {
       if (!*depth)
-        return gpg_error (GPG_ERR_INV_SEXP);
+        return gpg_err_make (errsource, GPG_ERR_INV_SEXP);
       *toklen = 1;
       s++; n--;
       (*depth)--;
@@ -288,10 +290,10 @@ parse_sexp (unsigned char const **buf, size_t *buflen,
   for (vlen=0; n && *s && *s != ':' && (*s >= '0' && *s <= '9'); s++, n--)
     vlen = vlen*10 + (*s - '0');
   if (!n || *s != ':')
-    return gpg_error (GPG_ERR_INV_SEXP);
+    return gpg_err_make (errsource, GPG_ERR_INV_SEXP);
   s++; n--;
   if (vlen > n)
-    return gpg_error (GPG_ERR_INV_SEXP);
+    return gpg_err_make (errsource, GPG_ERR_INV_SEXP);
   *tok = s;
   *toklen = vlen;
   s += vlen;
diff --git a/scd/tlv.h b/common/tlv.h
index 66ea871bc..a04af93ad 100644
--- a/scd/tlv.h
+++ b/common/tlv.h
@@ -80,11 +80,14 @@ const unsigned char *find_tlv_unchecked (const unsigned char *buffer,
 /* ASN.1 BER parser: Parse BUFFER of length SIZE and return the tag
    and the length part from the TLV triplet.  Update BUFFER and SIZE
    on success. */
-gpg_error_t parse_ber_header (unsigned char const **buffer, size_t *size,
-                              int *r_class, int *r_tag, 
-                              int *r_constructed,
-                              int *r_ndef, size_t *r_length, size_t *r_nhdr);
-
+gpg_error_t _parse_ber_header (unsigned char const **buffer, size_t *size,
+                               int *r_class, int *r_tag, 
+                               int *r_constructed,
+                               int *r_ndef, size_t *r_length, size_t *r_nhdr,
+                               gpg_err_source_t errsource);
+#define parse_ber_header(a,b,c,d,e,f,g,h) \
+        _parse_ber_header ((a),(b),(c),(d),(e),(f),(g),(h),\
+                           GPG_ERR_SOURCE_DEFAULT)
 
 
 /* Return the next token of an canconical encoded S-expression.  BUF
@@ -99,8 +102,11 @@ gpg_error_t parse_ber_header (unsigned char const **buffer, size_t *size,
    reflect on return the actual depth of the tree. To detect the end
    of the S-expression it is advisable to check DEPTH after a
    successful return. */
-gpg_error_t parse_sexp (unsigned char const **buf, size_t *buflen,
-                        int *depth, unsigned char const **tok, size_t *toklen);
+gpg_error_t _parse_sexp (unsigned char const **buf, size_t *buflen,
+                         int *depth, unsigned char const **tok, size_t *toklen,
+                         gpg_err_source_t errsource);
+#define parse_sexp(a,b,c,d,e) \
+        _parse_sexp ((a),(b),(c),(d),(e), GPG_ERR_SOURCE_DEFAULT)
 
 
 
diff --git a/common/util.h b/common/util.h
index 3ec5200bf..9821d6ab6 100644
--- a/common/util.h
+++ b/common/util.h
@@ -112,7 +112,7 @@ const char *isotimestamp (u32 stamp); /* GMT */
 const char *asctimestamp (u32 stamp); /* localized */
 
 
-/* Copy one iso ddate to another, this is inline so that we can do a
+/* Copy one ISO date to another, this is inline so that we can do a
    sanity check. */
 static inline void
 gnupg_copy_time (gnupg_isotime_t d, const gnupg_isotime_t s)
diff --git a/configure.ac b/configure.ac
index 1926cf9cd..ef9cbde40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,8 +56,8 @@ VERSION=$PACKAGE_VERSION
 AC_CONFIG_AUX_DIR(scripts)
 AC_CONFIG_SRCDIR(sm/gpgsm.c)
 AM_CONFIG_HEADER(config.h)
-AC_CANONICAL_TARGET()
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AC_CANONICAL_HOST
 AB_INIT
 
 AC_GNU_SOURCE
diff --git a/doc/ChangeLog b/doc/ChangeLog
index a176a04c4..69f028c3c 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-09  Werner Koch  <wk@g10code.com>
+
+	* gpgsm.texi (Certificate Options): Describe --validation-model.
+
 2007-07-23  Werner Koch  <wk@g10code.com>
 
 	* scdaemon.texi (Scdaemon Commands): Remove obsolete --print-atr.
diff --git a/doc/DETAILS b/doc/DETAILS
index ca5f346aa..2d60aae6a 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -253,8 +253,8 @@ more arguments in future versions.
         presence of the letter 'T' inside.
 
     VALIDSIG	<fingerprint in hex> <sig_creation_date> <sig-timestamp>
-		<expire-timestamp> [ <sig-version> <reserved> <pubkey-algo>
-		<hash-algo> <sig-class> <primary-key-fpr> ]
+		<expire-timestamp>  <sig-version> <reserved> <pubkey-algo>
+		<hash-algo> <sig-class> [ <primary-key-fpr> ]
 
 	The signature with the keyid is good. This is the same as
 	GOODSIG but has the fingerprint as the argument. Both status
@@ -269,8 +269,9 @@ more arguments in future versions.
 	useful to get back to the primary key without running gpg
 	again for this purpose.
 
-        The optional parameters are used for OpenPGP and are not
-        available for CMS signatures.
+        The primary-key-fpr parameter is used for OpenPGP and not
+        available for CMS signatures.  The sig-version as well as the
+        sig class is not defined for CMS and currently set to 0 and 00.
 
         Note, that *-TIMESTAMP may either be a number with seconds
         since epoch or an ISO 8601 string which can be detected by the
@@ -310,13 +311,21 @@ more arguments in future versions.
   
 
     TRUST_UNDEFINED <error token>
-    TRUST_NEVER  <error token>
-    TRUST_MARGINAL
-    TRUST_FULLY
-    TRUST_ULTIMATE
-	For good signatures one of these status lines are emitted
-	to indicate how trustworthy the signature is.  The error token
-        values are currently only emitted by gpgsm.
+    TRUST_NEVER     <error token>
+    TRUST_MARGINAL  [0  [<validation_model>]]
+    TRUST_FULLY     [0  [<validation_model>]] 
+    TRUST_ULTIMATE  [0  [<validation_model>]]
+	For good signatures one of these status lines are emitted to
+	indicate how trustworthy the signature is.  The error token
+	values are currently only emitted by gpgsm.  VALIDATION_MODEL
+	describes the algorithm used to check the validity of the key.
+	The default is the standard gpg Web of Trust model respective
+	the standard X.509 model.  The defined values are
+
+           "pgp"   for the standard PGP WoT.
+	   "shell" for the standard X.509 model.
+	   "chain" for the chain model.
+
 
     PKA_TRUST_GOOD <mailbox>
     PKA_TRUST_BAD  <mailbox>
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index 23e88afeb..38b35364c 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -412,6 +412,17 @@ requests in Dirmngr's configuration too (option
 @option{--allow-ocsp} and configure dirmngr properly.  If you don't do
 so you will get the error code @samp{Not supported}.
 
+
+@item --validation-model @var{name}
+@opindex validation-model
+This option changes the default validation model.  The only possible
+values are "shell" (which is the default) and "chain" which forces the
+use of the chain model.  The chain model is also used if an option in
+the @file{trustlist.txt} or an attribute of the certificate requests it.
+However the standard model (shell) is in that case always tried first.
+
+
+
 @end table
 
 @c *******************************************
@@ -550,7 +561,8 @@ encryption.  For convenience the strings @code{3DES}, @code{AES} and
 @opindex faked-system-time
 This option is only useful for testing; it sets the system time back or
 forth to @var{epoch} which is the number of seconds elapsed since the year
-1970.
+1970.  Alternativly @var{epoch} may be given as a full ISO time string
+(e.g. "20070924T154812").
 
 @item --with-ephemeral-keys
 @opindex with-ephemeral-keys
diff --git a/doc/specify-user-id.texi b/doc/specify-user-id.texi
index 0b615b657..0929a10f8 100644
--- a/doc/specify-user-id.texi
+++ b/doc/specify-user-id.texi
@@ -122,7 +122,7 @@ This should return the Root cert of the issuer.  See note above.
 
 @item By exact match on serial number and issuer's DN.
 This is indicated by a hash mark, followed by the hexadecmal
-representation of the serial number, the followed by a slash and the
+representation of the serial number, then followed by a slash and the
 RFC-2253 encoded DN of the issuer. See note above.
 
 @cartouche
diff --git a/jnlib/ChangeLog b/jnlib/ChangeLog
index 4fec67999..c7722876b 100644
--- a/jnlib/ChangeLog
+++ b/jnlib/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-09  Werner Koch  <wk@g10code.com>
+
+	* argparse.c (show_help): Expand the @EMAIL@ macro in the package
+	bug reporting address.
+
 2007-08-02  Werner Koch  <wk@g10code.com>
 
 	* t-stringhelp.c (test_compare_filenames): New.
diff --git a/jnlib/argparse.c b/jnlib/argparse.c
index 78ff3a46d..2d46884f0 100644
--- a/jnlib/argparse.c
+++ b/jnlib/argparse.c
@@ -832,8 +832,21 @@ show_help( ARGPARSE_OPTS *opts, unsigned flags )
 	    puts("\n(A single dash may be used instead of the double ones)");
     }
     if( (s=strusage(19)) ) {  /* bug reports to ... */
+        char *s2;
+
 	putchar('\n');
-	fputs(s, stdout);
+        s2 = strstr (s, "@EMAIL@");
+        if (s2)
+          {
+            if (s2-s)
+              fwrite (s, s2-s, 1, stdout);
+            fputs (PACKAGE_BUGREPORT, stdout);
+            s2 += 7;
+            if (*s2)
+              fputs (s2, stdout);
+          }
+        else
+          fputs(s, stdout);
     }
     fflush(stdout);
     exit(0);
diff --git a/po/be.po b/po/be.po
index 1b24263bf..d9abcc3d3 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-07-05 18:01+0200\n"
+"POT-Creation-Date: 2007-08-10 15:49+0200\n"
 "PO-Revision-Date: 2003-10-30 16:35+0200\n"
 "Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -20,52 +20,52 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: agent/call-pinentry.c:426
+#: agent/call-pinentry.c:436
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:429
+#: agent/call-pinentry.c:439
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 
-#: agent/call-pinentry.c:476
+#: agent/call-pinentry.c:486
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
+#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
 #, fuzzy
 msgid "PIN too long"
 msgstr "пароль занадта доўгі\n"
 
-#: agent/call-pinentry.c:497
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "пароль занадта доўгі\n"
 
-#: agent/call-pinentry.c:505
+#: agent/call-pinentry.c:515
 msgid "Invalid characters in PIN"
 msgstr ""
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:520
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:522
+#: agent/call-pinentry.c:532
 #, fuzzy
 msgid "Bad PIN"
 msgstr "дрэнны MPI"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:533
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "дрэнны пароль"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:569
 #, fuzzy
 msgid "Passphrase"
 msgstr "дрэнны пароль"
@@ -82,14 +82,14 @@ msgstr ""
 msgid "can't create `%s': %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
 #: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
-#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1796
+#: sm/gpgsm.c:1833 sm/gpgsm.c:1871 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr ""
@@ -176,35 +176,46 @@ msgstr[1] ""
 msgid "Take this one anyway"
 msgstr ""
 
-#: agent/genkey.c:99
+#: agent/genkey.c:99 agent/genkey.c:114
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Увядзіце пароль\n"
 
-#: agent/genkey.c:144
+#: agent/genkey.c:107
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+
+#: agent/genkey.c:113
+msgid "Yes, protection is not needed"
+msgstr ""
+
+#: agent/genkey.c:158
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
+#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "Увядзіце пароль\n"
 
-#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
 #: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:263
+#: agent/genkey.c:280
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "Паўтарыце пароль\n"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -214,242 +225,242 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:103
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
-#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
 #: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "шматслоўнасьць"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
-#: sm/gpgsm.c:337
+#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "працаваць менш шматслоўна"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:109
+#: agent/gpg-agent.c:118 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:119
+#: agent/gpg-agent.c:125 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:125
+#: agent/gpg-agent.c:126
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr ""
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:129
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 msgid "do not use the SCdaemon"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:145
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "Паўтарыце пароль\n"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:206 sm/gpgsm.c:525 tools/gpg-connect-agent.c:124
 #: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Калі ласка, паведамляйце пра памылкі на <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:262
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
+#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
-#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:340 sm/gpgsm.c:772 sm/gpgsm.c:775 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
+#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:863
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
-#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: scd/scdaemon.c:421 sm/gpgsm.c:867 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
+#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:874
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
-#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:921
+#: agent/gpg-agent.c:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
+#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:908
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
+#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
+#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
+#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "запіс у stdout\n"
 
-#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
+#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: тэчка створана\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1377
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1381
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1497
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1519
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
+#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
+#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
 #, c-format
 msgid "%s %s stopped\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1752
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:751
+#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
-#: tools/gpg-connect-agent.c:762
+#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr ""
@@ -511,42 +522,42 @@ msgstr ""
 msgid "cancelled\n"
 msgstr "скасавана карыстальнікам\n"
 
-#: agent/trustlist.c:131 agent/trustlist.c:319
+#: agent/trustlist.c:132 agent/trustlist.c:322
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/trustlist.c:146
+#: agent/trustlist.c:147
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: agent/trustlist.c:166 agent/trustlist.c:174
+#: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:180
+#: agent/trustlist.c:181
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: agent/trustlist.c:215
+#: agent/trustlist.c:216
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "памылка чытаньня файла"
 
-#: agent/trustlist.c:241 agent/trustlist.c:248
+#: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:280
+#: agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/trustlist.c:381 agent/trustlist.c:420
+#: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -559,7 +570,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:496
+#: agent/trustlist.c:507
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -569,7 +580,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:505
+#: agent/trustlist.c:516
 msgid "Correct"
 msgstr ""
 
@@ -581,58 +592,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:525
+#: agent/trustlist.c:536
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 #, fuzzy
 msgid "Yes"
 msgstr "yes [так]"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:393
+#: common/exechelp.c:302 common/exechelp.c:390
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/exechelp.c:369 common/exechelp.c:426
+#: common/exechelp.c:366 common/exechelp.c:423
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: common/exechelp.c:405 common/exechelp.c:635
+#: common/exechelp.c:402 common/exechelp.c:632
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/exechelp.c:461 common/exechelp.c:504
+#: common/exechelp.c:458 common/exechelp.c:501
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:469
+#: common/exechelp.c:466
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/exechelp.c:475 common/exechelp.c:515
+#: common/exechelp.c:472 common/exechelp.c:512
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/exechelp.c:510
+#: common/exechelp.c:507
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:521
+#: common/exechelp.c:518
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
@@ -651,25 +662,25 @@ msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: common/simple-pwquery.c:376
+#: common/simple-pwquery.c:373
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr ""
 
-#: common/simple-pwquery.c:387
+#: common/simple-pwquery.c:384
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:397
+#: common/simple-pwquery.c:394
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+#: common/simple-pwquery.c:557 common/simple-pwquery.c:653
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "скасавана карыстальнікам\n"
 
-#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+#: common/simple-pwquery.c:572 common/simple-pwquery.c:659
 msgid "problem with the agent\n"
 msgstr ""
 
@@ -844,7 +855,7 @@ msgstr ""
 msgid "not human readable"
 msgstr ""
 
-#: g10/card-util.c:62 g10/card-util.c:305
+#: g10/card-util.c:62 g10/card-util.c:308
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "сакрэтны ключ недаступны"
@@ -854,160 +865,160 @@ msgstr "сакрэтны ключ недаступны"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1391 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr ""
 
-#: g10/card-util.c:102 g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
 #: g10/keygen.c:1644
 msgid "Your selection? "
 msgstr ""
 
-#: g10/card-util.c:215 g10/card-util.c:265
+#: g10/card-util.c:218 g10/card-util.c:268
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:412
+#: g10/card-util.c:415
 msgid "male"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "female"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 #, fuzzy
 msgid "not forced"
 msgstr "непадтрымліваецца"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:521
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:523
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:525
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:539
+#: g10/card-util.c:542
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:544
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:562
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:580
+#: g10/card-util.c:583
 msgid "URL to retrieve public key: "
 msgstr ""
 
-#: g10/card-util.c:588
+#: g10/card-util.c:591
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
+#: g10/card-util.c:689 g10/card-util.c:758 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr ""
 
-#: g10/card-util.c:694
+#: g10/card-util.c:697
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:704
+#: g10/card-util.c:707
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:763
+#: g10/card-util.c:766
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:773
+#: g10/card-util.c:776
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:793
+#: g10/card-util.c:796
 #, fuzzy
 msgid "Language preferences: "
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/card-util.c:801
+#: g10/card-util.c:804
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:813
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/card-util.c:831
+#: g10/card-util.c:834
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:845
+#: g10/card-util.c:848
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:866
+#: g10/card-util.c:869
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:889
+#: g10/card-util.c:892
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:937
+#: g10/card-util.c:940
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:941
 msgid "not an OpenPGP card"
 msgstr ""
 
-#: g10/card-util.c:947
+#: g10/card-util.c:950
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1031
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1051 g10/card-util.c:1060
+#: g10/card-util.c:1054 g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1075
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1084
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1015,133 +1026,133 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1115
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/card-util.c:1117 g10/card-util.c:1194
+#: g10/card-util.c:1120 g10/card-util.c:1197
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/card-util.c:1118 g10/card-util.c:1196
+#: g10/card-util.c:1121 g10/card-util.c:1199
 msgid "   (2) Encryption key\n"
 msgstr ""
 
-#: g10/card-util.c:1119 g10/card-util.c:1198
+#: g10/card-util.c:1122 g10/card-util.c:1201
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1135 g10/card-util.c:1214 g10/keyedit.c:945
+#: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
 #: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr ""
 
-#: g10/card-util.c:1191
+#: g10/card-util.c:1194
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/card-util.c:1226
+#: g10/card-util.c:1229
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "невядомы альгарытм сьцісканьня"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1234
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1239
 msgid "secret key already stored on a card\n"
 msgstr ""
 
-#: g10/card-util.c:1304 g10/keyedit.c:1362
+#: g10/card-util.c:1307 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr ""
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1309
 #, fuzzy
 msgid "show admin commands"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1307 g10/keyedit.c:1365
+#: g10/card-util.c:1310 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "паказаць гэтую даведку"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1312
 #, fuzzy
 msgid "list all available data"
 msgstr "Даведка адсутнічае"
 
-#: g10/card-util.c:1312
+#: g10/card-util.c:1315
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1313
+#: g10/card-util.c:1316
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1317
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1315
+#: g10/card-util.c:1318
 msgid "change the login name"
 msgstr ""
 
-#: g10/card-util.c:1316
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "change the language preferences"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1320
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1322
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1323
 #, fuzzy
 msgid "generate new keys"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1324
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1325
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442 g10/keyedit.c:1634
+#: g10/card-util.c:1445 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Загад> "
 
-#: g10/card-util.c:1480
+#: g10/card-util.c:1483
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1511
+#: g10/card-util.c:1514
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1513
+#: g10/card-util.c:1516
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1587 g10/keyedit.c:2255
+#: g10/card-util.c:1590 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 
@@ -1149,7 +1160,7 @@ msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
@@ -1440,7 +1451,7 @@ msgstr "%s: немагчыма стварыць тэчку: %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 
-#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1456,27 +1467,27 @@ msgstr "|[файл]|зрабіць подпіс"
 msgid "|[file]|make a clear text signature"
 msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
 
-#: g10/gpg.c:372 sm/gpgsm.c:244
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "зрабіць адчэплены подпіс"
 
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "зашыфраваць даньні"
 
-#: g10/gpg.c:375 sm/gpgsm.c:246
+#: g10/gpg.c:375 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "шыфраваньне толькі сымэтрычнымі шыфрамі"
 
-#: g10/gpg.c:377 sm/gpgsm.c:247
+#: g10/gpg.c:377 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "разшыфраваць даньні (дапомна)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:248
+#: g10/gpg.c:379 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "праверыць подпіс"
 
-#: g10/gpg.c:381 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "паказаць сьпіс ключоў"
 
@@ -1489,11 +1500,11 @@ msgstr "паказаць сьпіс ключоў і подпісаў"
 msgid "list and check key signatures"
 msgstr "праверыць подпісы ключа"
 
-#: g10/gpg.c:385 sm/gpgsm.c:254
+#: g10/gpg.c:385 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/gpg.c:386 sm/gpgsm.c:252
+#: g10/gpg.c:386 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "паказаць сакрэтныя ключы"
 
@@ -1529,11 +1540,11 @@ msgstr ""
 msgid "export keys"
 msgstr "экспарт ключоў"
 
-#: g10/gpg.c:397 sm/gpgsm.c:257
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "экспартаваць ключы на паслужнік ключоў"
 
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
@@ -1569,11 +1580,11 @@ msgstr ""
 msgid "|algo [files]|print message digests"
 msgstr ""
 
-#: g10/gpg.c:430 sm/gpgsm.c:262
+#: g10/gpg.c:430 sm/gpgsm.c:264
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
 #: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1584,31 +1595,31 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:279
+#: g10/gpg.c:434 sm/gpgsm.c:281
 msgid "create ascii armored output"
 msgstr ""
 
-#: g10/gpg.c:436 sm/gpgsm.c:291
+#: g10/gpg.c:436 sm/gpgsm.c:293
 msgid "|NAME|encrypt for NAME"
 msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
 
-#: g10/gpg.c:447 sm/gpgsm.c:327
+#: g10/gpg.c:447 sm/gpgsm.c:331
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 
-#: g10/gpg.c:448 sm/gpgsm.c:330
+#: g10/gpg.c:448 sm/gpgsm.c:334
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 
-#: g10/gpg.c:453 sm/gpgsm.c:332
+#: g10/gpg.c:453 sm/gpgsm.c:336
 msgid "use canonical text mode"
 msgstr ""
 
-#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "выкарыстоўваць у якасьці файла вываду"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "не рабіць ніякіх зьменаў"
 
@@ -1624,7 +1635,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:393
+#: g10/gpg.c:553 sm/gpgsm.c:397
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1632,7 +1643,7 @@ msgstr ""
 "@\n"
 "(Глядзіце man старонку, для больш поўнага апісаньня ўсіх загадаў і выбараў)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:396
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1670,7 +1681,7 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:532
+#: g10/gpg.c:781 sm/gpgsm.c:538
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1698,7 +1709,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:669
+#: g10/gpg.c:1045 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "несумяшчальныя загады\n"
 
@@ -1774,451 +1785,451 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1544
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1552
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1560
 msgid "show the keyring name in key listings"
 msgstr ""
 
-#: g10/gpg.c:1564
+#: g10/gpg.c:1562
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1827
+#: g10/gpg.c:1825
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1981
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 
-#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
+#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/gpg.c:2401 g10/gpg.c:2413
+#: g10/gpg.c:2399 g10/gpg.c:2411
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2493
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4084
+#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2528
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2531
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2538
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2541
 msgid "invalid import options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2548
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2551
 msgid "invalid export options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2558
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2561
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2569
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2571
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2573
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2575
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2579
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2581
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2585
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2587
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2589
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2591
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2598
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2608
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2782
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2787
+#: g10/gpg.c:2785
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2873 sm/gpgsm.c:1220
+#: g10/gpg.c:2871 sm/gpgsm.c:1247
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2875
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2884
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не дазваляецца разам з %s!\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2887
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2902
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "запіс у stdout\n"
 
-#: g10/gpg.c:2918
+#: g10/gpg.c:2916
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2922
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2930
+#: g10/gpg.c:2928
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2943
+#: g10/gpg.c:2941
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
+#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1303
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
+#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1311
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3025
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3040
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3042
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3044
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3046
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3048
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3053
+#: g10/gpg.c:3051
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/gpg.c:3057
+#: g10/gpg.c:3055
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3062
 msgid "invalid default preferences\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3071
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3075
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3079
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3114
+#: g10/gpg.c:3112
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3159
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3164
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3171
+#: g10/gpg.c:3169
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3263
+#: g10/gpg.c:3261
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3272
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3295
+#: g10/gpg.c:3293
 msgid "--store [filename]"
 msgstr "--store [назва_файла]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3300
 msgid "--symmetric [filename]"
 msgstr "--symmetric [назва_файла]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3302
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3312
 msgid "--encrypt [filename]"
 msgstr "--encrypt [назва_файла]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3325
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3327
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3332
+#: g10/gpg.c:3330
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3348
 msgid "--sign [filename]"
 msgstr "--sign [назва_файла]"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3361
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3376
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3378
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3381
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3401
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [назва_файла]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3410
 msgid "--clearsign [filename]"
 msgstr "--clearsign [назва_файла]"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3435
 msgid "--decrypt [filename]"
 msgstr "--decrypt [назва_файла]"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3443
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3447
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3468
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [загады]"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3553
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3555
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3557
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3568
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3580
+#: g10/gpg.c:3578
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3631
+#: g10/gpg.c:3629
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3639
+#: g10/gpg.c:3637
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3729
+#: g10/gpg.c:3727
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3844
 msgid "[filename]"
 msgstr "[назва_файла]"
 
-#: g10/gpg.c:3850
+#: g10/gpg.c:3848
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4160
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4162
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4195
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
 
@@ -2231,7 +2242,7 @@ msgstr "выдаліць ключы са зьвязку грамадскіх к�
 msgid "make timestamp conflicts only a warning"
 msgstr ""
 
-#: g10/gpgv.c:75 sm/gpgsm.c:368
+#: g10/gpgv.c:75 sm/gpgsm.c:372
 msgid "|FD|write status info to this FD"
 msgstr ""
 
@@ -6357,62 +6368,62 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
 
-#: scd/scdaemon.c:105
+#: scd/scdaemon.c:108
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:357
+#: scd/scdaemon.c:114 sm/gpgsm.c:361
 msgid "read options from file"
 msgstr ""
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:124
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:129
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:134
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:135
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "несумяшчальныя загады\n"
 
-#: scd/scdaemon.c:206
+#: scd/scdaemon.c:209
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: scd/scdaemon.c:208
+#: scd/scdaemon.c:211
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:671
+#: scd/scdaemon.c:658
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1019
+#: scd/scdaemon.c:1006
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1024
+#: scd/scdaemon.c:1011
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6440,141 +6451,255 @@ msgstr ""
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:174
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr ""
+
+#: sm/certchain.c:195
+msgid "chain"
+msgstr ""
+
+#: sm/certchain.c:196
+#, fuzzy
+msgid "shell"
+msgstr "даведка (help)"
+
+#: sm/certchain.c:241
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr ""
 
-#: sm/certchain.c:212
+#: sm/certchain.c:279
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:250
+#: sm/certchain.c:317
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:260
+#: sm/certchain.c:327
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: sm/certchain.c:267 sm/certchain.c:296
+#: sm/certchain.c:334 sm/certchain.c:363
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:271 sm/certchain.c:300
+#: sm/certchain.c:338 sm/certchain.c:367
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "сакрэтны ключ недаступны"
 
-#: sm/certchain.c:411
+#: sm/certchain.c:478
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:431
+#: sm/certchain.c:498
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: sm/certchain.c:675
+#: sm/certchain.c:742
 msgid "certificate has been revoked"
 msgstr ""
 
-#: sm/certchain.c:684
+#: sm/certchain.c:752
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "дрэнны сэртыфікат"
 
-#: sm/certchain.c:688
+#: sm/certchain.c:757
+msgid "the status of the certificate is unknown"
+msgstr ""
+
+#: sm/certchain.c:762
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Даведка адсутнічае"
 
-#: sm/certchain.c:690
+#: sm/certchain.c:764
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:695
+#: sm/certchain.c:770
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: sm/certchain.c:791
-msgid "no issuer found in certificate"
-msgstr ""
-
-#: sm/certchain.c:820
+#: sm/certchain.c:799 sm/certchain.c:867
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:836
+#: sm/certchain.c:814 sm/certchain.c:899
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:849
+#: sm/certchain.c:815 sm/certchain.c:900
+#, fuzzy
+msgid "root certificate not yet valid"
+msgstr "сакрэтны ключ недаступны"
+
+#: sm/certchain.c:816 sm/certchain.c:901
+msgid "intermediate certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:829
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Гэты ключ згубіў састарэў!"
 
-#: sm/certchain.c:892
-msgid "self-signed certificate has a BAD signature"
+#: sm/certchain.c:830
+#, fuzzy
+msgid "root certificate has expired"
+msgstr "Гэты ключ згубіў састарэў!"
+
+#: sm/certchain.c:831
+#, fuzzy
+msgid "intermediate certificate has expired"
+msgstr "Гэты ключ згубіў састарэў!"
+
+#: sm/certchain.c:873
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:960
-msgid "root certificate is not marked trusted"
+#: sm/certchain.c:882
+#, fuzzy
+msgid "certificate with invalid validity"
+msgstr "Гэты ключ згубіў састарэў!"
+
+#: sm/certchain.c:919
+msgid "signature not created during lifetime of certificate"
+msgstr ""
+
+#: sm/certchain.c:921
+msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:975
+#: sm/certchain.c:922
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:926
+#, fuzzy
+msgid "  (  signature created at "
+msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
+
+#: sm/certchain.c:927
+#, fuzzy
+msgid "  (certificate created at "
+msgstr "дрэнны сэртыфікат"
+
+#: sm/certchain.c:930
+#, fuzzy
+msgid "  (certificate valid from "
+msgstr "дрэнны сэртыфікат"
+
+#: sm/certchain.c:931
+msgid "  (     issuer valid from "
+msgstr ""
+
+#: sm/certchain.c:961
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: sm/certchain.c:983
+#: sm/certchain.c:970
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:998
+#: sm/certchain.c:983
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1004
+#: sm/certchain.c:989
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1046
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr ""
+
+#: sm/certchain.c:1110
+msgid "no issuer found in certificate"
+msgstr ""
+
+#: sm/certchain.c:1184
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:1253
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:1266
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: sm/certchain.c:1041 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1053
+#: sm/certchain.c:1307
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1086
+#: sm/certchain.c:1340
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "праверыць подпіс"
 
-#: sm/certchain.c:1116
+#: sm/certchain.c:1371
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1167
+#: sm/certchain.c:1422
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
+#: sm/certchain.c:1462 sm/certchain.c:1730
+#, fuzzy
+msgid "certificate is good\n"
+msgstr "грамадскі ключ ня знойдзены"
+
+#: sm/certchain.c:1463
+#, fuzzy
+msgid "intermediate certificate is good\n"
+msgstr "дрэнны сэртыфікат"
+
+#: sm/certchain.c:1464
+#, fuzzy
+msgid "root certificate is good\n"
+msgstr "дрэнны сэртыфікат"
+
+#: sm/certchain.c:1620
+msgid "switching to chain model"
+msgstr ""
+
+#: sm/certchain.c:1629
+#, c-format
+msgid "validation model used: %s"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "chain model"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "shell model"
+msgstr ""
+
 #: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
@@ -6622,7 +6747,7 @@ msgstr "паказаць ключы й адбіткі пальцаў"
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
 "\"%s\"\n"
-"S/N %s, ID %08lX, created %s"
+"S/N %s, ID 0x%08lX, created %s"
 msgstr ""
 "Вам неабходна ўвесьці пароль, каб адчыніць сакрэтны ключ для карыстальніка:\n"
 "\"%.*s\"\n"
@@ -6632,7 +6757,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:131 sm/keylist.c:255
+#: sm/certlist.c:131 sm/keylist.c:258
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
@@ -6753,186 +6878,186 @@ msgstr "памылка стварэньня \"%s\": %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[файл]|зрабіць подпіс"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
 
-#: sm/gpgsm.c:251
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list external keys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list certificate chain"
 msgstr "дрэнны сэртыфікат"
 
-#: sm/gpgsm.c:256
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "import certificates"
 msgstr "дрэнны сэртыфікат"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:262
 #, fuzzy
 msgid "export certificates"
 msgstr "дрэнны сэртыфікат"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:268
 #, fuzzy
 msgid "change a passphrase"
 msgstr "дрэнны пароль"
 
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
 msgid "create base-64 encoded output"
 msgstr ""
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:287
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:296
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:302
+#: sm/gpgsm.c:304
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:305
+#: sm/gpgsm.c:309
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:312
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:315
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:319
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:323
 #, fuzzy
 msgid "|NAME|use NAME as default recipient"
 msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:325
 msgid "use the default key as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:338
+#: sm/gpgsm.c:342
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:346
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "праверыць подпісы ключа"
 
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:347
 msgid "always use a MDC for encryption"
 msgstr "заўсёдвы выкарыстоўваць MDC для шыфраваньня"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:352
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:353
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:354
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:356
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:357
 msgid "add this secret keyring to the list"
 msgstr ""
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
 msgid "|NAME|use NAME as default secret key"
 msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:359
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ВУЗЕЛ|     выкарыстоўваць гэты паслужнік для пошуку ключоў"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:360
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|НАЗВА|     усталяваць мноства знакаў тэрмінала"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:364
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:375
+#: sm/gpgsm.c:379
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:381
+#: sm/gpgsm.c:385
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:387
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:389
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "невядомы альгарытм сьцісканьня"
 
-#: sm/gpgsm.c:522
+#: sm/gpgsm.c:528
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: sm/gpgsm.c:525
+#: sm/gpgsm.c:531
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -6943,31 +7068,36 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: sm/gpgsm.c:604
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: sm/gpgsm.c:685
+#: sm/gpgsm.c:691
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: sm/gpgsm.c:1237
+#: sm/gpgsm.c:713
+#, fuzzy, c-format
+msgid "unknown validation model `%s'\n"
+msgstr "невядомая вэрсыя"
+
+#: sm/gpgsm.c:1264
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1316
+#: sm/gpgsm.c:1344
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1334
+#: sm/gpgsm.c:1362
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: sm/gpgsm.c:1529
+#: sm/gpgsm.c:1543
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -6989,7 +7119,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:375
+#: sm/import.c:541 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
@@ -7073,7 +7203,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234
+#: sm/qualified.c:234 sm/verify.c:536
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7092,29 +7222,34 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr ""
 
-#: sm/verify.c:386
+#: sm/verify.c:388
 #, fuzzy
 msgid "Signature made "
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: sm/verify.c:390
+#: sm/verify.c:392
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:391
-#, c-format
-msgid " using certificate ID %08lX\n"
-msgstr ""
+#: sm/verify.c:393
+#, fuzzy, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: sm/verify.c:507
+#: sm/verify.c:514
 #, fuzzy
 msgid "Good signature from"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: sm/verify.c:508
+#: sm/verify.c:515
 msgid "                aka"
 msgstr ""
 
+#: sm/verify.c:533
+#, fuzzy
+msgid "This is a qualified signature\n"
+msgstr "паказаць сьпіс ключоў і подпісаў"
+
 #: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
@@ -7151,131 +7286,136 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:315
+#: tools/gpg-connect-agent.c:314
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:323
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:382
+#: tools/gpg-connect-agent.c:381
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "пароль занадта доўгі\n"
 
-#: tools/gpg-connect-agent.c:386
+#: tools/gpg-connect-agent.c:385
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:458
+#: tools/gpg-connect-agent.c:457
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: tools/gpg-connect-agent.c:466
+#: tools/gpg-connect-agent.c:465
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: tools/gpg-connect-agent.c:474
+#: tools/gpg-connect-agent.c:473
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: tools/gpg-connect-agent.c:784
+#: tools/gpg-connect-agent.c:789
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: tools/gpg-connect-agent.c:793
+#: tools/gpg-connect-agent.c:798
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
+#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
-#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
+#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
-#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:501
+#: tools/gpgconf-comp.c:492
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:505
+#: tools/gpgconf-comp.c:496
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:509
+#: tools/gpgconf-comp.c:500
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:510
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:638
+#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#, fuzzy
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
+
+#: tools/gpgconf-comp.c:635
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:640
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:685
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:705
+#: tools/gpgconf-comp.c:708
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:749
+#: tools/gpgconf-comp.c:752
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:785
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:806
+#: tools/gpgconf-comp.c:809
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:814
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:848
+#: tools/gpgconf-comp.c:851
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2681
+#: tools/gpgconf-comp.c:2684
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -7617,9 +7757,6 @@ msgstr "непадтрымліваецца"
 #~ msgid "make a trust signature"
 #~ msgstr "зрабіць адчэплены подпіс"
 
-#~ msgid "help"
-#~ msgstr "даведка (help)"
-
 #, fuzzy
 #~ msgid "generate"
 #~ msgstr "агульная памылка"
diff --git a/po/ca.po b/po/ca.po
index 49445d54b..cac1f7d88 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-07-05 18:01+0200\n"
+"POT-Creation-Date: 2007-08-10 15:49+0200\n"
 "PO-Revision-Date: 2005-02-04 02:04+0100\n"
 "Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -40,54 +40,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 
-#: agent/call-pinentry.c:426
+#: agent/call-pinentry.c:436
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:429
+#: agent/call-pinentry.c:439
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/call-pinentry.c:476
+#: agent/call-pinentry.c:486
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
+#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
 #, fuzzy
 msgid "PIN too long"
 msgstr "la línia és massa llarga\n"
 
-#: agent/call-pinentry.c:497
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "la contrasenya és massa llarga\n"
 
-#: agent/call-pinentry.c:505
+#: agent/call-pinentry.c:515
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:520
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:522
+#: agent/call-pinentry.c:532
 #, fuzzy
 msgid "Bad PIN"
 msgstr "l'MPI és erroni"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:533
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "la contrasenya és errònia"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:569
 #, fuzzy
 msgid "Passphrase"
 msgstr "la contrasenya és errònia"
@@ -104,14 +104,14 @@ msgstr "l'algoritme de protecció %d%s no està suportat\n"
 msgid "can't create `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
 #: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
-#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1796
+#: sm/gpgsm.c:1833 sm/gpgsm.c:1871 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
@@ -201,35 +201,46 @@ msgstr[1] ""
 msgid "Take this one anyway"
 msgstr "Voleu usar de tota manera aquesta clau?"
 
-#: agent/genkey.c:99
+#: agent/genkey.c:99 agent/genkey.c:114
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Introduïu la contrasenya\n"
 
-#: agent/genkey.c:144
+#: agent/genkey.c:107
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+
+#: agent/genkey.c:113
+msgid "Yes, protection is not needed"
+msgstr ""
+
+#: agent/genkey.c:158
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Cal una contrasenya per a protegir la clau secreta.\n"
 "\n"
 
-#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
+#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
 #: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:263
+#: agent/genkey.c:280
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -239,249 +250,249 @@ msgstr ""
 "Opcions:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:103
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
 # Un dels dos és en la llista d'opcions amb --help. Urgh. jm
-#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
-#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
 #: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detall"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
-#: sm/gpgsm.c:337
+#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "una mica més silenciós"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:109
+#: agent/gpg-agent.c:118 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:119
+#: agent/gpg-agent.c:125 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:125
+#: agent/gpg-agent.c:126
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "cerca claus en un servidor de claus"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:129
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualitza la base de dades de confiança"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:145
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:206 sm/gpgsm.c:525 tools/gpg-connect-agent.c:124
 #: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Si us plau, informeu sobre els errors a <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:262
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
+#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
-#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:340 sm/gpgsm.c:772 sm/gpgsm.c:775 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
+#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:863
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existeix el fitxer d'opcions predeterminades «%s»\n"
 
-#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
-#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: scd/scdaemon.c:421 sm/gpgsm.c:867 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
+#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:874
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
-#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:921
+#: agent/gpg-agent.c:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
+#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:908
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
+#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
+#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
+#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
+#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: s'ha creat el directori\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1377
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1381
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: no s'ha pogut crear el directori: %s\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1497
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1519
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
+#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "ha fallat l'actualització de la clau secreta: %s\n"
 
-#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
+#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu claus es descarta\n"
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1752
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:751
+#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
 
-#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
-#: tools/gpg-connect-agent.c:762
+#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "la versió %d del protocol de gpg-agent no està suportada\n"
@@ -546,43 +557,43 @@ msgstr "error en la creació de la contrasenya: %s\n"
 msgid "cancelled\n"
 msgstr "Cancel·la"
 
-#: agent/trustlist.c:131 agent/trustlist.c:319
+#: agent/trustlist.c:132 agent/trustlist.c:322
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: agent/trustlist.c:146
+#: agent/trustlist.c:147
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: agent/trustlist.c:166 agent/trustlist.c:174
+#: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
 # Parts?  Peces?  ivb
-#: agent/trustlist.c:180
+#: agent/trustlist.c:181
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "parts de la clau secreta no estan disponbles\n"
 
-#: agent/trustlist.c:215
+#: agent/trustlist.c:216
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "error de lectura: %s\n"
 
-#: agent/trustlist.c:241 agent/trustlist.c:248
+#: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:280
+#: agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: agent/trustlist.c:381 agent/trustlist.c:420
+#: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -595,7 +606,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:496
+#: agent/trustlist.c:507
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -605,7 +616,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:505
+#: agent/trustlist.c:516
 msgid "Correct"
 msgstr ""
 
@@ -617,58 +628,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:525
+#: agent/trustlist.c:536
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 #, fuzzy
 msgid "Yes"
 msgstr "sí|si"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:393
+#: common/exechelp.c:302 common/exechelp.c:390
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: common/exechelp.c:369 common/exechelp.c:426
+#: common/exechelp.c:366 common/exechelp.c:423
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "no es pot obrir el fitxer: %s\n"
 
-#: common/exechelp.c:405 common/exechelp.c:635
+#: common/exechelp.c:402 common/exechelp.c:632
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: common/exechelp.c:461 common/exechelp.c:504
+#: common/exechelp.c:458 common/exechelp.c:501
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:469
+#: common/exechelp.c:466
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: common/exechelp.c:475 common/exechelp.c:515
+#: common/exechelp.c:472 common/exechelp.c:512
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: common/exechelp.c:510
+#: common/exechelp.c:507
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:521
+#: common/exechelp.c:518
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -687,26 +698,26 @@ msgstr "%s: no s'ha trobat l'usuari\n"
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: common/simple-pwquery.c:376
+#: common/simple-pwquery.c:373
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no s'ha pogut connectar amb «%s»: %s\n"
 
-#: common/simple-pwquery.c:387
+#: common/simple-pwquery.c:384
 msgid "communication problem with gpg-agent\n"
 msgstr "hi ha un problema de comunicació amb el gpg-agent\n"
 
-#: common/simple-pwquery.c:397
+#: common/simple-pwquery.c:394
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
 
-#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+#: common/simple-pwquery.c:557 common/simple-pwquery.c:653
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "s'ha cancel·lat per l'usuari\n"
 
-#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+#: common/simple-pwquery.c:572 common/simple-pwquery.c:659
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
@@ -894,7 +905,7 @@ msgstr "AVÍS: s'hi han trobat dades de notació invàlides\n"
 msgid "not human readable"
 msgstr "no llegible per humans"
 
-#: g10/card-util.c:62 g10/card-util.c:305
+#: g10/card-util.c:62 g10/card-util.c:308
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la clau secreta no està disponible"
@@ -906,31 +917,31 @@ msgstr ""
 
 # Destès? ivb
 # Desatès, sí. jm
-#: g10/card-util.c:75 g10/card-util.c:1391 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
 #, 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:102 g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
 #: g10/keygen.c:1644
 msgid "Your selection? "
 msgstr "La vostra selecció? "
 
-#: g10/card-util.c:215 g10/card-util.c:265
+#: g10/card-util.c:218 g10/card-util.c:268
 msgid "[not set]"
 msgstr "[no establert]"
 
-#: g10/card-util.c:412
+#: g10/card-util.c:415
 msgid "male"
 msgstr "home"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "female"
 msgstr "dóna"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "unspecified"
 msgstr "no especificat"
 
@@ -938,134 +949,134 @@ msgstr "no especificat"
 # Probablement és una clau, femení. jm
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "not forced"
 msgstr "no forçat"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "forced"
 msgstr "forçat"
 
-#: g10/card-util.c:518
+#: g10/card-util.c:521
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:523
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:525
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:539
+#: g10/card-util.c:542
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:544
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:562
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:580
+#: g10/card-util.c:583
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "no hi ha cap clau pública corresponent: %s\n"
 
-#: g10/card-util.c:588
+#: g10/card-util.c:591
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
+#: g10/card-util.c:689 g10/card-util.c:758 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: g10/card-util.c:694
+#: g10/card-util.c:697
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:704
+#: g10/card-util.c:707
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:763
+#: g10/card-util.c:766
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:773
+#: g10/card-util.c:776
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:793
+#: g10/card-util.c:796
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferències actualitzades"
 
-#: g10/card-util.c:801
+#: g10/card-util.c:804
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:813
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
 
-#: g10/card-util.c:831
+#: g10/card-util.c:834
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:845
+#: g10/card-util.c:848
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/card-util.c:866
+#: g10/card-util.c:869
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Empremta digital:"
 
-#: g10/card-util.c:889
+#: g10/card-util.c:892
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/card-util.c:937
+#: g10/card-util.c:940
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:941
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "no s'han trobat dades OpenPGP vàlides.\n"
 
-#: g10/card-util.c:947
+#: g10/card-util.c:950
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: g10/card-util.c:1031
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1051 g10/card-util.c:1060
+#: g10/card-util.c:1054 g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1075
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1084
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1073,135 +1084,135 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1115
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/card-util.c:1117 g10/card-util.c:1194
+#: g10/card-util.c:1120 g10/card-util.c:1197
 msgid "   (1) Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:1118 g10/card-util.c:1196
+#: g10/card-util.c:1121 g10/card-util.c:1199
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1198
+#: g10/card-util.c:1122 g10/card-util.c:1201
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1135 g10/card-util.c:1214 g10/keyedit.c:945
+#: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
 #: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "La selecció és invàlida.\n"
 
-#: g10/card-util.c:1191
+#: g10/card-util.c:1194
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: g10/card-util.c:1226
+#: g10/card-util.c:1229
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "l'algorisme de protecció és desconegut\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1234
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1239
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/card-util.c:1304 g10/keyedit.c:1362
+#: g10/card-util.c:1307 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "ix del menú"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1309
 #, fuzzy
 msgid "show admin commands"
 msgstr "les ordres entren en conflicte\n"
 
 # «pantalla» o «ajuda»?  ivb
 # «ajuda», evidentment. jm
-#: g10/card-util.c:1307 g10/keyedit.c:1365
+#: g10/card-util.c:1310 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "mostra aquesta ajuda"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1312
 #, fuzzy
 msgid "list all available data"
 msgstr "La clau és disponible en: "
 
-#: g10/card-util.c:1312
+#: g10/card-util.c:1315
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1313
+#: g10/card-util.c:1316
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1317
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1315
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "change the login name"
 msgstr "canvia la data de caducitat"
 
-#: g10/card-util.c:1316
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "change the language preferences"
 msgstr "canvia la confiança"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1320
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra empremta"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1322
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1323
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera un nou parell de claus"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1324
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1325
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442 g10/keyedit.c:1634
+#: g10/card-util.c:1445 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Ordre> "
 
-#: g10/card-util.c:1480
+#: g10/card-util.c:1483
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/card-util.c:1511
+#: g10/card-util.c:1514
 msgid "Admin commands are allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1513
+#: g10/card-util.c:1516
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1587 g10/keyedit.c:2255
+#: g10/card-util.c:1590 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "L'ordre no és vàlida (proveu «help»)\n"
 
@@ -1209,7 +1220,7 @@ msgstr "L'ordre no és vàlida (proveu «help»)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona per a aquesta ordre\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no s'ha pogut obrir «%s»\n"
@@ -1530,7 +1541,7 @@ msgstr "s'usarà la clau secundària %08lX en lloc de la primària %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "clau %08lX: clau secreta sense clau pública - es descarta\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1546,27 +1557,27 @@ msgstr "|[fitxer]|crea una signatura"
 msgid "|[file]|make a clear text signature"
 msgstr "|[fitxer]|crea una signatura en text clar"
 
-#: g10/gpg.c:372 sm/gpgsm.c:244
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "crea una signatura separada"
 
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "xifra dades"
 
-#: g10/gpg.c:375 sm/gpgsm.c:246
+#: g10/gpg.c:375 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "xifra només amb xifratge simètric"
 
-#: g10/gpg.c:377 sm/gpgsm.c:247
+#: g10/gpg.c:377 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "desxifra dades (predeterminat)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:248
+#: g10/gpg.c:379 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "verifica una signatura"
 
-#: g10/gpg.c:381 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "llista claus"
 
@@ -1581,11 +1592,11 @@ msgid "list and check key signatures"
 msgstr "comprova les signatures de la claus"
 
 # «dactilars» o «digitals»?  ivb
-#: g10/gpg.c:385 sm/gpgsm.c:254
+#: g10/gpg.c:385 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "llista claus i empremtes digitals"
 
-#: g10/gpg.c:386 sm/gpgsm.c:252
+#: g10/gpg.c:386 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "llista claus secretes"
 
@@ -1621,11 +1632,11 @@ msgstr "genera un certificat de revocació"
 msgid "export keys"
 msgstr "exporta claus"
 
-#: g10/gpg.c:397 sm/gpgsm.c:257
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "exporta claus a un servidor de claus"
 
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "importa claus d'un servidor de claus"
 
@@ -1661,11 +1672,11 @@ msgstr "actualitza la base de dades de confiança"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fitxers]|imprimeix resums de missatges"
 
-#: g10/gpg.c:430 sm/gpgsm.c:262
+#: g10/gpg.c:430 sm/gpgsm.c:264
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
 #: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1676,31 +1687,31 @@ msgstr ""
 "Opcions:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:279
+#: g10/gpg.c:434 sm/gpgsm.c:281
 msgid "create ascii armored output"
 msgstr "crea eixida amb armadura ascii"
 
-#: g10/gpg.c:436 sm/gpgsm.c:291
+#: g10/gpg.c:436 sm/gpgsm.c:293
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|xifra per a NOM"
 
-#: g10/gpg.c:447 sm/gpgsm.c:327
+#: g10/gpg.c:447 sm/gpgsm.c:331
 msgid "use this user-id to sign or decrypt"
 msgstr "usa aquest id per a signar o desxifrar"
 
-#: g10/gpg.c:448 sm/gpgsm.c:330
+#: g10/gpg.c:448 sm/gpgsm.c:334
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivell de compressió N (0 no comprimeix)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:332
+#: g10/gpg.c:453 sm/gpgsm.c:336
 msgid "use canonical text mode"
 msgstr "usa el mode de text canònic"
 
-#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "fitxer d'eixida"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "no fa cap canvi"
 
@@ -1716,7 +1727,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:393
+#: g10/gpg.c:553 sm/gpgsm.c:397
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1727,7 +1738,7 @@ msgstr ""
 # Crec q (A)lice (orig.), (B)ob (dest.), etc. són noms usats pel Zimmerman
 # en el manual original de PGP.  A, B, C...  ivb
 # En efecte. Idem per a Mallory més endavant. Els deixe com a l'original. jm
-#: g10/gpg.c:556 sm/gpgsm.c:396
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1770,7 +1781,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:781 sm/gpgsm.c:532
+#: g10/gpg.c:781 sm/gpgsm.c:538
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1798,7 +1809,7 @@ msgstr "Compressió: "
 msgid "usage: gpg [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:669
+#: g10/gpg.c:1045 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
 
@@ -1877,467 +1888,467 @@ msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\
 msgid "unknown configuration item `%s'\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: 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:1548
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1554
+#: 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:1556
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1562
+#: 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:1564
+#: 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:1827
+#: g10/gpg.c:1825
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1981
 #, 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:2243 g10/gpg.c:2884 g10/gpg.c:2896
+#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s no és per a ús normal!\n"
 
-#: g10/gpg.c:2401 g10/gpg.c:2413
+#: g10/gpg.c:2399 g10/gpg.c:2411
 #, 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:2495
+#: g10/gpg.c:2493
 #, 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:2518 g10/gpg.c:2713 g10/keyedit.c:4084
+#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
 #, 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:2530
+#: g10/gpg.c:2528
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2531
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2538
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2541
 msgid "invalid import options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2548
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2551
 msgid "invalid export options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2558
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2561
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2569
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2571
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2573
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2575
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2579
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2581
 #, 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:2585
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2585
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2587
 #, 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
+#: g10/gpg.c:2589
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2591
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2598
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2608
 #, 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:2784
+#: g10/gpg.c:2782
 #, 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:2787
+#: g10/gpg.c:2785
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2873 sm/gpgsm.c:1220
+#: g10/gpg.c:2871 sm/gpgsm.c:1247
 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:2877
+#: g10/gpg.c:2875
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVÍS: %s té preferència sobre %s\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2884
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2887
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no té sentit amb %s!\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2902
 #, 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:2918
+#: g10/gpg.c:2916
 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:2924
+#: g10/gpg.c:2922
 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:2930
+#: g10/gpg.c:2928
 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:2943
+#: g10/gpg.c:2941
 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:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
+#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1303
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
+#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1311
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3025
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3040
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3042
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3044
 #, 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:3048
+#: g10/gpg.c:3046
 #, 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:3050
+#: g10/gpg.c:3048
 #, 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:3053
+#: g10/gpg.c:3051
 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:3057
+#: g10/gpg.c:3055
 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:3064
+#: g10/gpg.c:3062
 msgid "invalid default preferences\n"
 msgstr "les preferències per defecte són invàlides\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3071
 msgid "invalid personal cipher preferences\n"
 msgstr "les preferències personals de xifrat són invàlides\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3075
 msgid "invalid personal digest preferences\n"
 msgstr "les preferències personals de digest són invàlides\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3079
 msgid "invalid personal compress preferences\n"
 msgstr "les preferències personals de compressió són invàlides\n"
 
-#: g10/gpg.c:3114
+#: g10/gpg.c:3112
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3159
 #, 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:3166
+#: g10/gpg.c:3164
 #, 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:3171
+#: g10/gpg.c:3169
 #, 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:3263
+#: g10/gpg.c:3261
 #, 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:3274
+#: g10/gpg.c:3272
 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:3295
+#: g10/gpg.c:3293
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3300
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3302
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3312
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3325
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3327
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3332
+#: g10/gpg.c:3330
 #, 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:3350
+#: g10/gpg.c:3348
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3361
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3376
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3378
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3381
 #, 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:3403
+#: g10/gpg.c:3401
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3410
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3435
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3443
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3447
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3468
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ordres]"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3553
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3557
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3568
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/gpg.c:3580
+#: g10/gpg.c:3578
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/gpg.c:3631
+#: g10/gpg.c:3629
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/gpg.c:3639
+#: g10/gpg.c:3637
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/gpg.c:3729
+#: g10/gpg.c:3727
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3844
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
-#: g10/gpg.c:3850
+#: g10/gpg.c:3848
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4160
 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:4162
 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:4195
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
@@ -2350,7 +2361,7 @@ msgstr "pren les claus d'aquest anell"
 msgid "make timestamp conflicts only a warning"
 msgstr "fes els conflictes de marques de temps només un avís"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:368
+#: g10/gpgv.c:75 sm/gpgsm.c:372
 msgid "|FD|write status info to this FD"
 msgstr "|FD|escriu informació d'estat en aquest FD"
 
@@ -6917,64 +6928,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
 
-#: scd/scdaemon.c:105
+#: scd/scdaemon.c:108
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:357
+#: scd/scdaemon.c:114 sm/gpgsm.c:361
 #, fuzzy
 msgid "read options from file"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:124
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:129
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "no usa el terminal en absolut"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:134
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:135
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "les ordres entren en conflicte\n"
 
-#: scd/scdaemon.c:206
+#: scd/scdaemon.c:209
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: scd/scdaemon.c:208
+#: scd/scdaemon.c:211
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:671
+#: scd/scdaemon.c:658
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1019
+#: scd/scdaemon.c:1006
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1024
+#: scd/scdaemon.c:1011
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7003,152 +7014,269 @@ msgstr "la versió %d del protocol de gpg-agent no està suportada\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:174
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr ""
+
+#: sm/certchain.c:195
+msgid "chain"
+msgstr ""
+
+#: sm/certchain.c:196
+#, fuzzy
+msgid "shell"
+msgstr "ajuda"
+
+#: sm/certchain.c:241
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "la versió %d del protocol de gpg-agent no està suportada\n"
 
-#: sm/certchain.c:212
+#: sm/certchain.c:279
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:250
+#: sm/certchain.c:317
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:260
+#: sm/certchain.c:327
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
 
-#: sm/certchain.c:267 sm/certchain.c:296
+#: sm/certchain.c:334 sm/certchain.c:363
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:271 sm/certchain.c:300
+#: sm/certchain.c:338 sm/certchain.c:367
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: sm/certchain.c:411
+#: sm/certchain.c:478
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:431
+#: sm/certchain.c:498
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: sm/certchain.c:675
+#: sm/certchain.c:742
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: aquesta clau ha estat revocada!"
 
-#: sm/certchain.c:684
+#: sm/certchain.c:752
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Certificat correcte"
 
-#: sm/certchain.c:688
+#: sm/certchain.c:757
+msgid "the status of the certificate is unknown"
+msgstr ""
+
+#: sm/certchain.c:762
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "La clau és disponible en: "
 
-#: sm/certchain.c:690
+#: sm/certchain.c:764
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:695
+#: sm/certchain.c:770
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: sm/certchain.c:791
-#, fuzzy
-msgid "no issuer found in certificate"
-msgstr "Certificat correcte"
-
-#: sm/certchain.c:820
+#: sm/certchain.c:799 sm/certchain.c:867
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "problema en la lectura del certificat: %s\n"
 
-#: sm/certchain.c:836
+#: sm/certchain.c:814 sm/certchain.c:899
 #, fuzzy
 msgid "certificate not yet valid"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:849
+#: sm/certchain.c:815 sm/certchain.c:900
+#, fuzzy
+msgid "root certificate not yet valid"
+msgstr "Certificat de revocació vàlid"
+
+#: sm/certchain.c:816 sm/certchain.c:901
+#, fuzzy
+msgid "intermediate certificate not yet valid"
+msgstr "Certificat de revocació vàlid"
+
+#: sm/certchain.c:829
 #, fuzzy
 msgid "certificate has expired"
 msgstr "problema en la lectura del certificat: %s\n"
 
-#: sm/certchain.c:892
-msgid "self-signed certificate has a BAD signature"
+#: sm/certchain.c:830
+#, fuzzy
+msgid "root certificate has expired"
+msgstr "problema en la lectura del certificat: %s\n"
+
+#: sm/certchain.c:831
+#, fuzzy
+msgid "intermediate certificate has expired"
+msgstr "problema en la lectura del certificat: %s\n"
+
+#: sm/certchain.c:873
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:960
+#: sm/certchain.c:882
 #, fuzzy
-msgid "root certificate is not marked trusted"
+msgid "certificate with invalid validity"
+msgstr "problema en la lectura del certificat: %s\n"
+
+#: sm/certchain.c:919
+msgid "signature not created during lifetime of certificate"
+msgstr ""
+
+#: sm/certchain.c:921
+msgid "certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:922
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:926
+#, fuzzy
+msgid "  (  signature created at "
+msgstr "        signatures noves: %lu\n"
+
+#: sm/certchain.c:927
+#, fuzzy
+msgid "  (certificate created at "
+msgstr "S'ha creat el certificat de revocació.\n"
+
+#: sm/certchain.c:930
+#, fuzzy
+msgid "  (certificate valid from "
+msgstr "Certificat de revocació vàlid"
+
+#: sm/certchain.c:931
+msgid "  (     issuer valid from "
 msgstr ""
-"No s'han trobat certificats amb confiança no definida.\n"
-"\n"
 
-#: sm/certchain.c:975
+#: sm/certchain.c:961
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Empremta digital:"
 
-#: sm/certchain.c:983
+#: sm/certchain.c:970
 #, fuzzy
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 "No s'han trobat certificats amb confiança no definida.\n"
 "\n"
 
-#: sm/certchain.c:998
+#: sm/certchain.c:983
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1004
+#: sm/certchain.c:989
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1046
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr ""
+
+#: sm/certchain.c:1110
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "Certificat correcte"
+
+#: sm/certchain.c:1184
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:1253
+#, fuzzy
+msgid "root certificate is not marked trusted"
+msgstr ""
+"No s'han trobat certificats amb confiança no definida.\n"
+"\n"
+
+#: sm/certchain.c:1266
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: sm/certchain.c:1041 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:157
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1053
+#: sm/certchain.c:1307
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1086
+#: sm/certchain.c:1340
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifica una signatura"
 
-#: sm/certchain.c:1116
+#: sm/certchain.c:1371
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1167
+#: sm/certchain.c:1422
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
+#: sm/certchain.c:1462 sm/certchain.c:1730
+#, fuzzy
+msgid "certificate is good\n"
+msgstr "Certificat de revocació vàlid"
+
+#: sm/certchain.c:1463
+#, fuzzy
+msgid "intermediate certificate is good\n"
+msgstr "certificat duplicat: esborrat"
+
+#: sm/certchain.c:1464
+#, fuzzy
+msgid "root certificate is good\n"
+msgstr ""
+"No s'han trobat certificats amb confiança no definida.\n"
+"\n"
+
+#: sm/certchain.c:1620
+msgid "switching to chain model"
+msgstr ""
+
+#: sm/certchain.c:1629
+#, c-format
+msgid "validation model used: %s"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "chain model"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "shell model"
+msgstr ""
+
 #: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
@@ -7207,7 +7335,7 @@ msgstr "error: l'empremta digital és invàlida\n"
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
 "\"%s\"\n"
-"S/N %s, ID %08lX, created %s"
+"S/N %s, ID 0x%08lX, created %s"
 msgstr ""
 "Necessiteu la contrasenya per desblocar la clau secreta de l'usuari:\n"
 "«%2$.*1$s»\n"
@@ -7217,7 +7345,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:131 sm/keylist.c:255
+#: sm/certlist.c:131 sm/keylist.c:258
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
@@ -7339,182 +7467,182 @@ msgstr "error en la creació de la contrasenya: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "%s: error en escriure el registre de directoris: %s\n"
 
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[fitxer]|crea una signatura"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[fitxer]|crea una signatura en text clar"
 
-#: sm/gpgsm.c:251
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list external keys"
 msgstr "llista claus secretes"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/gpgsm.c:256
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "elimina claus de l'anell públic"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificat correcte"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:262
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificat correcte"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:268
 #, fuzzy
 msgid "change a passphrase"
 msgstr "canvia la contrasenya"
 
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crea eixida amb armadura ascii"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:287
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:296
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:302
+#: sm/gpgsm.c:304
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:305
+#: sm/gpgsm.c:309
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:312
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:315
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:319
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:323
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:325
 msgid "use the default key as default recipient"
 msgstr "usa la clau predeterminada com a destinatari predeterminat"
 
-#: sm/gpgsm.c:338
+#: sm/gpgsm.c:342
 msgid "don't use the terminal at all"
 msgstr "no usa el terminal en absolut"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:346
 msgid "force v3 signatures"
 msgstr "força signatures v3"
 
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:347
 msgid "always use a MDC for encryption"
 msgstr "sempre utilitza un MDC per a xifrar"
 
 # Mode desatès (SC)  ivb
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:352
 msgid "batch mode: never ask"
 msgstr "mode desatès: no pregunta mai"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:353
 msgid "assume yes on most questions"
 msgstr "suposa «sí» en la majoria de les preguntes"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:354
 msgid "assume no on most questions"
 msgstr "suposa «no» en la majoria de les preguntes"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:356
 msgid "add this keyring to the list of keyrings"
 msgstr "afegeix aquest anell a la llista"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:357
 msgid "add this secret keyring to the list"
 msgstr "afegeix aquest anell secret a la llista"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|usa NOM com a clau secreta predeterminada"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:359
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|usa aquest servidor per a cercar claus"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:360
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|el joc de caràcters serà NOM"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:364
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:375
+#: sm/gpgsm.c:379
 msgid "|FILE|load extension module FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: sm/gpgsm.c:381
+#: sm/gpgsm.c:385
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|usa l'algoritme de xifratge NOM"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:387
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|usa l'algoritme de resum de missatges NOM"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:389
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritme de compressió N"
 
-#: sm/gpgsm.c:522
+#: sm/gpgsm.c:528
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: sm/gpgsm.c:525
+#: sm/gpgsm.c:531
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7525,32 +7653,37 @@ msgstr ""
 "signa, comprova, xifra o desxifra\n"
 "l'operació predeterminada depén de les dades introduïdes\n"
 
-#: sm/gpgsm.c:604
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: sm/gpgsm.c:685
+#: sm/gpgsm.c:691
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "no s'ha pogut connectar amb «%s»: %s\n"
 
-#: sm/gpgsm.c:1237
+#: sm/gpgsm.c:713
+#, fuzzy, c-format
+msgid "unknown validation model `%s'\n"
+msgstr "el destinatari predeterminat és desconegut «%s»\n"
+
+#: sm/gpgsm.c:1264
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1316
+#: sm/gpgsm.c:1344
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
 # No em passe! ;)  ivb
-#: sm/gpgsm.c:1334
+#: sm/gpgsm.c:1362
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: sm/gpgsm.c:1529
+#: sm/gpgsm.c:1543
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7573,7 +7706,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:375
+#: sm/import.c:541 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -7657,7 +7790,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234
+#: sm/qualified.c:234 sm/verify.c:536
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7676,30 +7809,37 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: sm/verify.c:386
+#: sm/verify.c:388
 #, fuzzy
 msgid "Signature made "
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: sm/verify.c:390
+#: sm/verify.c:392
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:391
-#, c-format
-msgid " using certificate ID %08lX\n"
-msgstr ""
+#: sm/verify.c:393
+#, fuzzy, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr "error en la creació de la contrasenya: %s\n"
 
-#: sm/verify.c:507
+#: sm/verify.c:514
 #, fuzzy
 msgid "Good signature from"
 msgstr "Signatura correcta de \""
 
-#: sm/verify.c:508
+#: sm/verify.c:515
 #, fuzzy
 msgid "                aka"
 msgstr "              alias \""
 
+#: sm/verify.c:533
+#, fuzzy
+msgid "This is a qualified signature\n"
+msgstr ""
+"\n"
+"Açò serà una autosignatura.\n"
+
 #: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
@@ -7736,132 +7876,137 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:315
+#: tools/gpg-connect-agent.c:314
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:323
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:382
+#: tools/gpg-connect-agent.c:381
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "la línia és massa llarga\n"
 
-#: tools/gpg-connect-agent.c:386
+#: tools/gpg-connect-agent.c:385
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:458
+#: tools/gpg-connect-agent.c:457
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: tools/gpg-connect-agent.c:466
+#: tools/gpg-connect-agent.c:465
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: tools/gpg-connect-agent.c:474
+#: tools/gpg-connect-agent.c:473
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: tools/gpg-connect-agent.c:784
+#: tools/gpg-connect-agent.c:789
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: tools/gpg-connect-agent.c:793
+#: tools/gpg-connect-agent.c:798
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
+#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
-#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
+#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
-#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:501
+#: tools/gpgconf-comp.c:492
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:505
+#: tools/gpgconf-comp.c:496
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:509
+#: tools/gpgconf-comp.c:500
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:510
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:638
+#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#, fuzzy
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NOM|xifra per a NOM"
+
+#: tools/gpgconf-comp.c:635
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:640
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOM|usa l'algoritme de xifratge NOM per a les contrasenyes"
 
-#: tools/gpgconf-comp.c:705
+#: tools/gpgconf-comp.c:708
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:749
+#: tools/gpgconf-comp.c:752
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:785
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:806
+#: tools/gpgconf-comp.c:809
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:814
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:848
+#: tools/gpgconf-comp.c:851
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2681
+#: tools/gpgconf-comp.c:2684
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8699,9 +8844,6 @@ msgstr "l'algoritme de protecció %d%s no està suportat\n"
 #~ msgid "save"
 #~ msgstr "desa"
 
-#~ msgid "help"
-#~ msgstr "ajuda"
-
 #~ msgid "fpr"
 #~ msgstr "fpr"
 
diff --git a/po/cs.po b/po/cs.po
index 3c5dbb325..8393846c5 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-07-05 18:01+0200\n"
+"POT-Creation-Date: 2007-08-10 15:49+0200\n"
 "PO-Revision-Date: 2004-11-26 09:12+0200\n"
 "Last-Translator: Roman Pavlik <rp@tns.cz>\n"
 "Language-Team: Czech <translations.cs@gnupg.cz>\n"
@@ -20,54 +20,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "ulo�en� fingerprintu se nezda�ilo: %s\n"
 
-#: agent/call-pinentry.c:426
+#: agent/call-pinentry.c:436
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:429
+#: agent/call-pinentry.c:439
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: agent/call-pinentry.c:476
+#: agent/call-pinentry.c:486
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
+#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
 #, fuzzy
 msgid "PIN too long"
 msgstr "��dek je p��li� dlouh�"
 
-#: agent/call-pinentry.c:497
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "��dek je p��li� dlouh�"
 
-#: agent/call-pinentry.c:505
+#: agent/call-pinentry.c:515
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Neplatn� znak ve jm�n�\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:520
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:522
+#: agent/call-pinentry.c:532
 #, fuzzy
 msgid "Bad PIN"
 msgstr "�patn� MPI"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:533
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "�patn� heslo"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:569
 #, fuzzy
 msgid "Passphrase"
 msgstr "�patn� heslo"
@@ -84,14 +84,14 @@ msgstr "ochrann� algoritmus %d nen� podporov�n\n"
 msgid "can't create `%s': %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
 #: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
-#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1796
+#: sm/gpgsm.c:1833 sm/gpgsm.c:1871 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
@@ -178,35 +178,46 @@ msgstr[1] ""
 msgid "Take this one anyway"
 msgstr "Pou��t p�esto tento kl��? (a/N) "
 
-#: agent/genkey.c:99
+#: agent/genkey.c:99 agent/genkey.c:114
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Vlo�it heslo\n"
 
-#: agent/genkey.c:144
+#: agent/genkey.c:107
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+
+#: agent/genkey.c:113
+msgid "Yes, protection is not needed"
+msgstr ""
+
+#: agent/genkey.c:158
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Pro ochranu Va�eho tajn�ho kl��e mus�te zadat heslo.\n"
 "\n"
 
-#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
+#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "zm�nit heslo"
 
-#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
 #: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:263
+#: agent/genkey.c:280
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "zm�nit heslo"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -216,105 +227,105 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:103
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
-#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
 #: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "s dodate�n�mi informacemi"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
-#: sm/gpgsm.c:337
+#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "b�t o trochu v�c tich�"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:109
+#: agent/gpg-agent.c:118 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:119
+#: agent/gpg-agent.c:125 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:125
+#: agent/gpg-agent.c:126
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "vyhledat kl��e na serveru kl���"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:129
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "nastavit sadu preferenc� pro vybran� u�ivatelsk� ID"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualizovat datab�zi d�v�ry"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:145
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:206 sm/gpgsm.c:525 tools/gpg-connect-agent.c:124
 #: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
@@ -322,143 +333,143 @@ msgstr ""
 "Chyby oznamte, pros�m, na adresu <gnupg-bugs@gnu.org>.\n"
 "P�ipom�nky k p�ekladu <rp@tns.cz>.\n"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:262
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
+#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
-#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:340 sm/gpgsm.c:772 sm/gpgsm.c:775 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
+#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:863
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� soubor s mo�nostmi `%s'\n"
 
-#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
-#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: scd/scdaemon.c:421 sm/gpgsm.c:867 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
+#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:874
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "chyba p�i vytv��en� `%s': %s\n"
 
-#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
-#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:921
+#: agent/gpg-agent.c:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
+#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:908
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nemohu vytvo�it adres�� `%s': %s\n"
 
-#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
+#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
+#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "chyba p�i hled�n� z�znamu d�v�ryhodnosti v `%s': %s\n"
 
-#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
+#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
+#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "adres�� `%s' vytvo�en\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1377
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) selhal v %s: %s\n"
 
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1381
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "nemohu vytvo�it adres�� `%s': %s\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1497
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1519
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
+#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aktualizace tajn�ho kl��e selhala: %s\n"
 
-#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
+#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: p�esko�eno: %s\n"
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1752
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:751
+#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "�patn� form�t prom�nn� prost�ed� GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
-#: tools/gpg-connect-agent.c:762
+#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verze %d nen� podporov�n\n"
@@ -523,42 +534,42 @@ msgstr "chyba p�i vytv��en� hesla: %s\n"
 msgid "cancelled\n"
 msgstr "zru�eno"
 
-#: agent/trustlist.c:131 agent/trustlist.c:319
+#: agent/trustlist.c:132 agent/trustlist.c:322
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "chyba v `%s': %s\n"
 
-#: agent/trustlist.c:146
+#: agent/trustlist.c:147
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: agent/trustlist.c:166 agent/trustlist.c:174
+#: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:180
+#: agent/trustlist.c:181
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "tajn� ��sti kl��e nejsou dostupn�\n"
 
-#: agent/trustlist.c:215
+#: agent/trustlist.c:216
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "chyba p�i �ten� v `%s': %s\n"
 
-#: agent/trustlist.c:241 agent/trustlist.c:248
+#: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:280
+#: agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: agent/trustlist.c:381 agent/trustlist.c:420
+#: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -571,7 +582,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:496
+#: agent/trustlist.c:507
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -581,7 +592,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:505
+#: agent/trustlist.c:516
 msgid "Correct"
 msgstr ""
 
@@ -593,58 +604,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:525
+#: agent/trustlist.c:536
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 #, fuzzy
 msgid "Yes"
 msgstr "ano"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:393
+#: common/exechelp.c:302 common/exechelp.c:390
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: common/exechelp.c:369 common/exechelp.c:426
+#: common/exechelp.c:366 common/exechelp.c:423
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "nemohu otev��t podepsan� data '%s'\n"
 
-#: common/exechelp.c:405 common/exechelp.c:635
+#: common/exechelp.c:402 common/exechelp.c:632
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: common/exechelp.c:461 common/exechelp.c:504
+#: common/exechelp.c:458 common/exechelp.c:501
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:469
+#: common/exechelp.c:466
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "chyba p�i z�sk�n� informac� o aktu�ln�m kl��i: %s\n"
 
-#: common/exechelp.c:475 common/exechelp.c:515
+#: common/exechelp.c:472 common/exechelp.c:512
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: common/exechelp.c:510
+#: common/exechelp.c:507
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:521
+#: common/exechelp.c:518
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
@@ -663,25 +674,25 @@ msgstr "[ID u�ivatele nenalezeno]"
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: common/simple-pwquery.c:376
+#: common/simple-pwquery.c:373
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nemohu se p�ipojit k `%s': %s\n"
 
-#: common/simple-pwquery.c:387
+#: common/simple-pwquery.c:384
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:397
+#: common/simple-pwquery.c:394
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+#: common/simple-pwquery.c:557 common/simple-pwquery.c:653
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "zru�eno u�ivatelem\n"
 
-#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+#: common/simple-pwquery.c:572 common/simple-pwquery.c:659
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "probl�m s agentem - pou��v�n� agenta vypnuto\n"
@@ -860,7 +871,7 @@ msgstr "VAROV�N�: nalezen neplatn� form�t z�pisu data\n"
 msgid "not human readable"
 msgstr "nen� v p��mo �iteln�m form�tu"
 
-#: g10/card-util.c:62 g10/card-util.c:305
+#: g10/card-util.c:62 g10/card-util.c:308
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGp karta nen� dostupn�: %s\n"
@@ -870,153 +881,153 @@ 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:75 g10/card-util.c:1391 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "nelze prov�st v d�vkov�m m�du\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
 #: g10/keygen.c:1644
 msgid "Your selection? "
 msgstr "V� v�b�r? "
 
-#: g10/card-util.c:215 g10/card-util.c:265
+#: g10/card-util.c:218 g10/card-util.c:268
 msgid "[not set]"
 msgstr "[nen� nastaven]"
 
-#: g10/card-util.c:412
+#: g10/card-util.c:415
 msgid "male"
 msgstr "mu�"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "female"
 msgstr "�ena"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "unspecified"
 msgstr "neuvedeno"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "not forced"
 msgstr "nen� vy�adov�no"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "forced"
 msgstr "vy�adov�no"
 
-#: g10/card-util.c:518
+#: g10/card-util.c:521
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Chyba: V sou�asn� verzi je povolenou pouze plain ASCII.\n"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:523
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Chyba: Znak \"<\" nelze pou��t.\n"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:525
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Chyba: V�ce mezer nen� povoleno.\n"
 
-#: g10/card-util.c:539
+#: g10/card-util.c:542
 msgid "Cardholder's surname: "
 msgstr "P��jmen� dr�itele karty: "
 
-#: g10/card-util.c:541
+#: g10/card-util.c:544
 msgid "Cardholder's given name: "
 msgstr "Jm�no (k�estn�) dr�itele karty: "
 
-#: g10/card-util.c:559
+#: g10/card-util.c:562
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Chyba: jm�no a p��jmen� je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:580
+#: g10/card-util.c:583
 msgid "URL to retrieve public key: "
 msgstr "URL pro z�sk�n� ve�ejn�ho kl��e: "
 
-#: g10/card-util.c:588
+#: g10/card-util.c:591
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Chyba: URL je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
+#: g10/card-util.c:689 g10/card-util.c:758 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: g10/card-util.c:694
+#: g10/card-util.c:697
 msgid "Login data (account name): "
 msgstr "Login (jm�nu ��tu): "
 
-#: g10/card-util.c:704
+#: g10/card-util.c:707
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Chyba: Login je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:763
+#: g10/card-util.c:766
 msgid "Private DO data: "
 msgstr "Priv�tn� DO data: "
 
-#: g10/card-util.c:773
+#: g10/card-util.c:776
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Chyba: Priv�tn� DO je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:793
+#: g10/card-util.c:796
 msgid "Language preferences: "
 msgstr "Jazykov� p�edvolby: "
 
-#: g10/card-util.c:801
+#: g10/card-util.c:804
 msgid "Error: invalid length of preference string.\n"
 msgstr "Chyba: neplatn� d�lka �etezce s p�edvolbami.\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:813
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Chyba: neplatn� znak v �et�zci s p�edvolbami\n"
 
-#: g10/card-util.c:831
+#: g10/card-util.c:834
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Zadejte pohlav�: M - mu�sk�, F - �ensk� nebo stisn�te mezern�k: "
 
-#: g10/card-util.c:845
+#: g10/card-util.c:848
 msgid "Error: invalid response.\n"
 msgstr "Chyba: neplatn� odpov��.\n"
 
-#: g10/card-util.c:866
+#: g10/card-util.c:869
 msgid "CA fingerprint: "
 msgstr "CA fingerprint: "
 
-#: g10/card-util.c:889
+#: g10/card-util.c:892
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Chyba: nespr�vn� naform�tovan� fingerprint.\n"
 
-#: g10/card-util.c:937
+#: g10/card-util.c:940
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "operace s kl��em nen� mo�n�: %s\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:941
 msgid "not an OpenPGP card"
 msgstr "toto nen� OpenPGP karta"
 
-#: g10/card-util.c:947
+#: g10/card-util.c:950
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "chyba p�i z�sk�n� informac� o aktu�ln�m kl��i: %s\n"
 
-#: g10/card-util.c:1031
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr "P�epsat existuj�c� kl��? (a/N) "
 
-#: g10/card-util.c:1051 g10/card-util.c:1060
+#: g10/card-util.c:1054 g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Vytvo�it z�lohu �ifrovac�ho kl��e mimo kartu? (A/n) "
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1075
 msgid "Replace existing keys? (y/N) "
 msgstr "P�epsat existuj�c� kl��e? (a/N) "
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1084
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1027,120 +1038,120 @@ msgstr ""
 "   PIN = `%s'     PIN administr�tora = `%s'\n"
 "Toto nastaven� m��ete zm�nit p��kazem --change-pin\n"
 
-#: g10/card-util.c:1115
+#: g10/card-util.c:1118
 msgid "Please select the type of key to generate:\n"
 msgstr "Pros�m, vyberte druh kl��e, kter� chcete generovat:\n"
 
-#: g10/card-util.c:1117 g10/card-util.c:1194
+#: g10/card-util.c:1120 g10/card-util.c:1197
 msgid "   (1) Signature key\n"
 msgstr "   (1) Podepisovac� kl��\n"
 
-#: g10/card-util.c:1118 g10/card-util.c:1196
+#: g10/card-util.c:1121 g10/card-util.c:1199
 msgid "   (2) Encryption key\n"
 msgstr "   (2) �ifrovac� kl��\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1198
+#: g10/card-util.c:1122 g10/card-util.c:1201
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiza�n� kl��\n"
 
-#: g10/card-util.c:1135 g10/card-util.c:1214 g10/keyedit.c:945
+#: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
 #: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�b�r.\n"
 
-#: g10/card-util.c:1191
+#: g10/card-util.c:1194
 msgid "Please select where to store the key:\n"
 msgstr "Pros�m vyberte m�sto pro uchov�n� kl��e:\n"
 
-#: g10/card-util.c:1226
+#: g10/card-util.c:1229
 msgid "unknown key protection algorithm\n"
 msgstr "nezn�m� algoritmus pro ochranu kl��e\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1234
 msgid "secret parts of key are not available\n"
 msgstr "tajn� ��sti kl�e nejsou dostupn�\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1239
 msgid "secret key already stored on a card\n"
 msgstr "tajn� kl�� je na kart� ulo�en\n"
 
-#: g10/card-util.c:1304 g10/keyedit.c:1362
+#: g10/card-util.c:1307 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "ukon�it toto menu"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1309
 msgid "show admin commands"
 msgstr "zobraz administr�torsk� p��kazy"
 
-#: g10/card-util.c:1307 g10/keyedit.c:1365
+#: g10/card-util.c:1310 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "uk�zat tuto pomoc"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1312
 msgid "list all available data"
 msgstr "vypi� v�echna dostupn� data"
 
-#: g10/card-util.c:1312
+#: g10/card-util.c:1315
 msgid "change card holder's name"
 msgstr "zm�n� jm�no majitele karty"
 
-#: g10/card-util.c:1313
+#: g10/card-util.c:1316
 msgid "change URL to retrieve key"
 msgstr "zm�n� URL pro z�sk�n� kl��e"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1317
 msgid "fetch the key specified in the card URL"
 msgstr "z�sk� kl�� specifikovan� v URL karty"
 
-#: g10/card-util.c:1315
+#: g10/card-util.c:1318
 msgid "change the login name"
 msgstr "zm�nit login name"
 
-#: g10/card-util.c:1316
+#: g10/card-util.c:1319
 msgid "change the language preferences"
 msgstr "zm�nit jazykov� p�edvolby"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1320
 msgid "change card holder's sex"
 msgstr "zm�n� pohlav� dr�itele karty"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1321
 msgid "change a CA fingerprint"
 msgstr "vypsat fingerprint certifika�n� autority"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1322
 msgid "toggle the signature force PIN flag"
 msgstr "zapnout/vypnout po�adov�n� PINu p�i ka�d� self-sign operaci"
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1323
 msgid "generate new keys"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1324
 msgid "menu to change or unblock the PIN"
 msgstr "nab�dka pro zm�nu anebo odblokov�n� PINu"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1325
 msgid "verify the PIN and list all data"
 msgstr "ov�� PIN a vypi� v�echna data"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1634
+#: g10/card-util.c:1445 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "P��kaz> "
 
-#: g10/card-util.c:1480
+#: g10/card-util.c:1483
 msgid "Admin-only command\n"
 msgstr "pouze administr�torsk� p��kazy\n"
 
-#: g10/card-util.c:1511
+#: g10/card-util.c:1514
 msgid "Admin commands are allowed\n"
 msgstr "administr�torsk� p��kazy jsou povoleny\n"
 
-#: g10/card-util.c:1513
+#: g10/card-util.c:1516
 msgid "Admin commands are not allowed\n"
 msgstr "administr�torsk� p��kazy nejsou povoleny\n"
 
-#: g10/card-util.c:1587 g10/keyedit.c:2255
+#: g10/card-util.c:1590 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
 
@@ -1148,7 +1159,7 @@ msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output pro tento p��kaz nen� platn�\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nelze otev��t `%s'\n"
@@ -1448,7 +1459,7 @@ msgstr "pou��v�m podkl�� %s m�sto prim�rn�ho kl��e %s\n"
 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/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1464,27 +1475,27 @@ msgstr "|[soubor]|vytvo�it podpis"
 msgid "|[file]|make a clear text signature"
 msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
 
-#: g10/gpg.c:372 sm/gpgsm.c:244
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "vytvo�it podpis odd�len� od dokumentu"
 
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "�ifrovat data"
 
-#: g10/gpg.c:375 sm/gpgsm.c:246
+#: g10/gpg.c:375 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrov�n� pouze se symetrickou �ifrou"
 
-#: g10/gpg.c:377 sm/gpgsm.c:247
+#: g10/gpg.c:377 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "de�ifrovat data (implicitn�)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:248
+#: g10/gpg.c:379 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "verifikovat podpis"
 
-#: g10/gpg.c:381 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "vypsat seznam kl���"
 
@@ -1496,11 +1507,11 @@ msgstr "vypsat seznam kl��� a podpis�"
 msgid "list and check key signatures"
 msgstr "vypsat a zkontrolovat podpisy kl���"
 
-#: g10/gpg.c:385 sm/gpgsm.c:254
+#: g10/gpg.c:385 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "vypsat seznam kl��� a fingerprint�"
 
-#: g10/gpg.c:386 sm/gpgsm.c:252
+#: g10/gpg.c:386 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "vypsat seznam tajn�ch kl���"
 
@@ -1536,11 +1547,11 @@ msgstr "vytvo�it revoka�n� certifik�t"
 msgid "export keys"
 msgstr "exportovat kl��e"
 
-#: g10/gpg.c:397 sm/gpgsm.c:257
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "exportovat kl��e na server kl���"
 
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "importovat kl��e ze serveru kl���"
 
@@ -1576,11 +1587,11 @@ msgstr "aktualizovat datab�zi d�v�ry"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [soubory]  vypi� hash"
 
-#: g10/gpg.c:430 sm/gpgsm.c:262
+#: g10/gpg.c:430 sm/gpgsm.c:264
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
 #: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1591,35 +1602,35 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:279
+#: g10/gpg.c:434 sm/gpgsm.c:281
 msgid "create ascii armored output"
 msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
 
-#: g10/gpg.c:436 sm/gpgsm.c:291
+#: g10/gpg.c:436 sm/gpgsm.c:293
 msgid "|NAME|encrypt for NAME"
 msgstr "|JM�NO|�ifrovat pro JM�NO"
 
-#: g10/gpg.c:447 sm/gpgsm.c:327
+#: g10/gpg.c:447 sm/gpgsm.c:331
 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:448 sm/gpgsm.c:330
+#: g10/gpg.c:448 sm/gpgsm.c:334
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavit �rov�� komprimace N (0 - ��dn�\n"
 " komprimace)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:332
+#: g10/gpg.c:453 sm/gpgsm.c:336
 msgid "use canonical text mode"
 msgstr "pou��t kanonick� textov� m�d"
 
-#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "pou��t jako v�stupn� soubor"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "neprov�d�t ��dn� zm�ny"
 
@@ -1635,7 +1646,7 @@ msgstr "pou��t chov�n� striktn� podle OpenPGP"
 msgid "generate PGP 2.x compatible messages"
 msgstr "generovat zpr�vu komplatibiln� s PGP 2.x"
 
-#: g10/gpg.c:553 sm/gpgsm.c:393
+#: g10/gpg.c:553 sm/gpgsm.c:397
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1643,7 +1654,7 @@ msgstr ""
 "@\n"
 "(Pou�ijte manu�lov� str�nky pro kompletn� seznam v�ech p��kaz� a mo�nost�)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:396
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1681,7 +1692,7 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:532
+#: g10/gpg.c:781 sm/gpgsm.c:538
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1709,7 +1720,7 @@ msgstr "Komprese: "
 msgid "usage: gpg [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: g10/gpg.c:1045 sm/gpgsm.c:669
+#: g10/gpg.c:1045 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "konfliktn� p��kazy\n"
 
@@ -1804,458 +1815,458 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: 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:1548
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1554
+#: 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:1556
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1562
+#: 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:1564
+#: 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:1827
+#: g10/gpg.c:1825
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1981
 #, 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:2243 g10/gpg.c:2884 g10/gpg.c:2896
+#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
 #, 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:2401 g10/gpg.c:2413
+#: g10/gpg.c:2399 g10/gpg.c:2411
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2493
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nen� platn� znakov� sada\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4084
+#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru kl���\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2528
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2531
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2538
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2541
 msgid "invalid import options\n"
 msgstr "neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2548
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2551
 msgid "invalid export options\n"
 msgstr "neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2558
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2561
 msgid "invalid list options\n"
 msgstr "neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2569
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2571
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2573
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2575
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2579
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2581
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2585
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2587
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2589
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2591
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2598
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2601
 msgid "invalid verify options\n"
 msgstr "neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2608
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2782
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2787
+#: g10/gpg.c:2785
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2873 sm/gpgsm.c:1220
+#: g10/gpg.c:2871 sm/gpgsm.c:1247
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROV�N�: program m��e vytvo�it soubor core!\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2875
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROV�N�: %s p�ep��e %s\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2884
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nen� dovoleno pou��vat %s s %s!\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2887
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�v� s %s smysl!\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2902
 #, 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:2918
+#: g10/gpg.c:2916
 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:2924
+#: g10/gpg.c:2922
 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:2930
+#: g10/gpg.c:2928
 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:2943
+#: g10/gpg.c:2941
 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:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
+#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1303
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
+#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1311
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� komprimovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3025
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3040
 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:3044
+#: g10/gpg.c:3042
 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:3046
+#: g10/gpg.c:3044
 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:3048
+#: g10/gpg.c:3046
 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:3050
+#: g10/gpg.c:3048
 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:3053
+#: g10/gpg.c:3051
 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:3057
+#: g10/gpg.c:3055
 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:3064
+#: g10/gpg.c:3062
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� p�edvolby\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3071
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro �ifrov�n�\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3075
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro hashov�n�\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3079
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro komprimaci\n"
 
-#: g10/gpg.c:3114
+#: g10/gpg.c:3112
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud nen� funk�n� s %s\n"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3159
 #, 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:3166
+#: g10/gpg.c:3164
 #, 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:3171
+#: g10/gpg.c:3169
 #, 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:3263
+#: g10/gpg.c:3261
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3272
 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:3295
+#: g10/gpg.c:3293
 msgid "--store [filename]"
 msgstr "--store [jm�no souboru]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3300
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3302
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symetrick� �ifrov�n� `%s' se nepovedlo: %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3312
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3325
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3327
 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:3332
+#: g10/gpg.c:3330
 #, 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:3350
+#: g10/gpg.c:3348
 msgid "--sign [filename]"
 msgstr "--sign [jm�no souboru]"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3361
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3376
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3378
 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:3383
+#: g10/gpg.c:3381
 #, 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:3403
+#: g10/gpg.c:3401
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3410
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jm�no souboru]"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3435
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jm�no souboru]"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3443
 msgid "--sign-key user-id"
 msgstr "--sign-key id u�ivatele"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3447
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u�ivatele"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3468
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u�ivatele [p��kazy]"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3553
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odesl�n� na keyserver se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "z�sk�n� dat z keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3557
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export kl��e se nepoda�il: %s\n"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3568
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hled�n� na keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3580
+#: g10/gpg.c:3578
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh dat na keyserveru se nezda�il: %s\n"
 
-#: g10/gpg.c:3631
+#: g10/gpg.c:3629
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dov�n� z ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3639
+#: g10/gpg.c:3637
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3729
+#: g10/gpg.c:3727
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3844
 msgid "[filename]"
 msgstr "[jm�no souboru]"
 
-#: g10/gpg.c:3850
+#: g10/gpg.c:3848
 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:4160
 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:4162
 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:4195
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
@@ -2267,7 +2278,7 @@ msgstr "ber kl��e z t�to kl��enky (keyringu)"
 msgid "make timestamp conflicts only a warning"
 msgstr "pouze varov�n� p�i konfliktu �asov�ho raz�tka"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:368
+#: g10/gpgv.c:75 sm/gpgsm.c:372
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapsat informace o stavu do tohoto FD"
 
@@ -6619,61 +6630,61 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "p��stup na %s se nezda�il - vadn� OpenPGP karta?\n"
 
-#: scd/scdaemon.c:105
+#: scd/scdaemon.c:108
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:357
+#: scd/scdaemon.c:114 sm/gpgsm.c:361
 #, fuzzy
 msgid "read options from file"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:124
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:126
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:129
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:134
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:135
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "zobraz administr�torsk� p��kazy"
 
-#: scd/scdaemon.c:206
+#: scd/scdaemon.c:209
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: scd/scdaemon.c:208
+#: scd/scdaemon.c:211
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:671
+#: scd/scdaemon.c:658
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1019
+#: scd/scdaemon.c:1006
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1024
+#: scd/scdaemon.c:1011
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6702,143 +6713,257 @@ msgstr "gpg-agent protokol verze %d nen� podporov�n\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:174
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr ""
+
+#: sm/certchain.c:195
+msgid "chain"
+msgstr ""
+
+#: sm/certchain.c:196
+msgid "shell"
+msgstr ""
+
+#: sm/certchain.c:241
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agent protokol verze %d nen� podporov�n\n"
 
-#: sm/certchain.c:212
+#: sm/certchain.c:279
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:250
+#: sm/certchain.c:317
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:260
+#: sm/certchain.c:327
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "Nemohu otev��t `%s': %s\n"
 
-#: sm/certchain.c:267 sm/certchain.c:296
+#: sm/certchain.c:334 sm/certchain.c:363
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:271 sm/certchain.c:300
+#: sm/certchain.c:338 sm/certchain.c:367
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "exportov�n� tajn�ho kl��e nen� povoleno\n"
 
-#: sm/certchain.c:411
+#: sm/certchain.c:478
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:431
+#: sm/certchain.c:498
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "nelze ulo�it kl��: %s\n"
 
-#: sm/certchain.c:675
+#: sm/certchain.c:742
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "POZN�MKA: kl�� byl revokov�n"
 
-#: sm/certchain.c:684
+#: sm/certchain.c:752
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "�patn� certifik�t"
 
-#: sm/certchain.c:688
+#: sm/certchain.c:757
+msgid "the status of the certificate is unknown"
+msgstr ""
+
+#: sm/certchain.c:762
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Kl�� k dispozici na: "
 
-#: sm/certchain.c:690
+#: sm/certchain.c:764
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:695
+#: sm/certchain.c:770
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
 
-#: sm/certchain.c:791
-#, fuzzy
-msgid "no issuer found in certificate"
-msgstr "vytvo�it revoka�n� certifik�t"
-
-#: sm/certchain.c:820
+#: sm/certchain.c:799 sm/certchain.c:867
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:836
+#: sm/certchain.c:814 sm/certchain.c:899
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:849
+#: sm/certchain.c:815 sm/certchain.c:900
+#, fuzzy
+msgid "root certificate not yet valid"
+msgstr "exportov�n� tajn�ho kl��e nen� povoleno\n"
+
+#: sm/certchain.c:816 sm/certchain.c:901
+msgid "intermediate certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:829
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Platnost kl��e vypr�ela!"
 
-#: sm/certchain.c:892
-msgid "self-signed certificate has a BAD signature"
+#: sm/certchain.c:830
+#, fuzzy
+msgid "root certificate has expired"
+msgstr "Platnost kl��e vypr�ela!"
+
+#: sm/certchain.c:831
+#, fuzzy
+msgid "intermediate certificate has expired"
+msgstr "Platnost kl��e vypr�ela!"
+
+#: sm/certchain.c:873
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:960
-msgid "root certificate is not marked trusted"
+#: sm/certchain.c:882
+#, fuzzy
+msgid "certificate with invalid validity"
+msgstr "Platnost kl��e vypr�ela!"
+
+#: sm/certchain.c:919
+msgid "signature not created during lifetime of certificate"
+msgstr ""
+
+#: sm/certchain.c:921
+msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:975
+#: sm/certchain.c:922
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:926
+#, fuzzy
+msgid "  (  signature created at "
+msgstr "         odstran�n� podpisy: %lu\n"
+
+#: sm/certchain.c:927
+#, fuzzy
+msgid "  (certificate created at "
+msgstr "Revoka�n� certifik�t vytvo�en.\n"
+
+#: sm/certchain.c:930
+#, fuzzy
+msgid "  (certificate valid from "
+msgstr "�patn� certifik�t"
+
+#: sm/certchain.c:931
+#, fuzzy
+msgid "  (     issuer valid from "
+msgstr "      Seriov� ��slo karty ="
+
+#: sm/certchain.c:961
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "CA fingerprint: "
 
-#: sm/certchain.c:983
+#: sm/certchain.c:970
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:998
+#: sm/certchain.c:983
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1004
+#: sm/certchain.c:989
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1046
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr ""
+
+#: sm/certchain.c:1110
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "vytvo�it revoka�n� certifik�t"
+
+#: sm/certchain.c:1184
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:1253
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:1266
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
 
-#: sm/certchain.c:1041 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1053
+#: sm/certchain.c:1307
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1086
+#: sm/certchain.c:1340
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifikovat podpis"
 
-#: sm/certchain.c:1116
+#: sm/certchain.c:1371
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1167
+#: sm/certchain.c:1422
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
+#: sm/certchain.c:1462 sm/certchain.c:1730
+#, fuzzy
+msgid "certificate is good\n"
+msgstr "duplicita p�edvolby `%s'\n"
+
+#: sm/certchain.c:1463
+#, fuzzy
+msgid "intermediate certificate is good\n"
+msgstr "Revoka�n� certifik�t vytvo�en.\n"
+
+#: sm/certchain.c:1464
+#, fuzzy
+msgid "root certificate is good\n"
+msgstr "�patn� certifik�t"
+
+#: sm/certchain.c:1620
+msgid "switching to chain model"
+msgstr ""
+
+#: sm/certchain.c:1629
+#, c-format
+msgid "validation model used: %s"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "chain model"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "shell model"
+msgstr ""
+
 #: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
@@ -6886,7 +7011,7 @@ msgstr "Chyba: neplatn� odpov��.\n"
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
 "\"%s\"\n"
-"S/N %s, ID %08lX, created %s"
+"S/N %s, ID 0x%08lX, created %s"
 msgstr ""
 "Pot�ebujete heslo, abyste odemknul(a) tajn� kl�� pro u�ivatele:\n"
 "\"%.*s\"\n"
@@ -6896,7 +7021,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:131 sm/keylist.c:255
+#: sm/certlist.c:131 sm/keylist.c:258
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "chyba p�i z�sk�n� informac� o aktu�ln�m kl��i: %s\n"
@@ -7018,190 +7143,190 @@ msgstr "chyba p�i vytv��en� hesla: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "%s: chyba p�i z�pisu adres��ov�ho z�znamu: %s\n"
 
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[soubor]|vytvo�it podpis"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
 
-#: sm/gpgsm.c:251
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list external keys"
 msgstr "vypsat seznam tajn�ch kl���"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list certificate chain"
 msgstr "�patn� certifik�t"
 
-#: sm/gpgsm.c:256
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "odstranit kl�� ze souboru ve�ejn�ch kl���"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "import certificates"
 msgstr "�patn� certifik�t"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:262
 #, fuzzy
 msgid "export certificates"
 msgstr "�patn� certifik�t"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 #, fuzzy
 msgid "register a smartcard"
 msgstr "p�idat kl�� na kartu"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:268
 #, fuzzy
 msgid "change a passphrase"
 msgstr "zm�nit heslo"
 
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:287
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:296
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:302
+#: sm/gpgsm.c:304
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:305
+#: sm/gpgsm.c:309
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:312
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:315
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:319
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:323
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:325
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "p�esko�eno: ve�ejn� kl�� je u� nastaven podle implicitn�ho adres�ta\n"
 
-#: sm/gpgsm.c:338
+#: sm/gpgsm.c:342
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:346
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "kontrolovat podpisy"
 
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:347
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:352
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:353
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:354
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:356
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "ber kl��e z t�to kl��enky (keyringu)"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:357
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "Pro proveden� t�to operace je pot�eba tajn� kl��.\n"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:359
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:360
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|JM�NO|�ifrovat pro JM�NO"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:364
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:375
+#: sm/gpgsm.c:379
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:381
+#: sm/gpgsm.c:385
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "nezn�m� �ifrovac� algoritmus"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:387
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:389
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "nezn�m� komprima�n� algoritmus"
 
-#: sm/gpgsm.c:522
+#: sm/gpgsm.c:528
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: sm/gpgsm.c:525
+#: sm/gpgsm.c:531
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7212,31 +7337,36 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: sm/gpgsm.c:604
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: sm/gpgsm.c:685
+#: sm/gpgsm.c:691
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "nemohu se p�ipojit k `%s': %s\n"
 
-#: sm/gpgsm.c:1237
+#: sm/gpgsm.c:713
+#, fuzzy, c-format
+msgid "unknown validation model `%s'\n"
+msgstr "nezn�m� volba `%s'\n"
+
+#: sm/gpgsm.c:1264
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1316
+#: sm/gpgsm.c:1344
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1334
+#: sm/gpgsm.c:1362
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: sm/gpgsm.c:1529
+#: sm/gpgsm.c:1543
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7259,7 +7389,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:375
+#: sm/import.c:541 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
@@ -7343,7 +7473,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234
+#: sm/qualified.c:234 sm/verify.c:536
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7362,30 +7492,35 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
 
-#: sm/verify.c:386
+#: sm/verify.c:388
 #, fuzzy
 msgid "Signature made "
 msgstr "Podpis vytvo�en %s\n"
 
-#: sm/verify.c:390
+#: sm/verify.c:392
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:391
-#, c-format
-msgid " using certificate ID %08lX\n"
-msgstr ""
+#: sm/verify.c:393
+#, fuzzy, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr "chyba p�i z�sk�n� informac� o aktu�ln�m kl��i: %s\n"
 
-#: sm/verify.c:507
+#: sm/verify.c:514
 #, fuzzy
 msgid "Good signature from"
 msgstr "Dobr� podpis od \"%s\""
 
-#: sm/verify.c:508
+#: sm/verify.c:515
 #, fuzzy
 msgid "                aka"
 msgstr "                alias \"%s\""
 
+#: sm/verify.c:533
+#, fuzzy
+msgid "This is a qualified signature\n"
+msgstr "Jedn� se o podpis kl��e j�m sam�m.\n"
+
 #: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
@@ -7422,131 +7557,136 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:315
+#: tools/gpg-connect-agent.c:314
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:323
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:382
+#: tools/gpg-connect-agent.c:381
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "��dek je p��li� dlouh�"
 
-#: tools/gpg-connect-agent.c:386
+#: tools/gpg-connect-agent.c:385
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:458
+#: tools/gpg-connect-agent.c:457
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "nezn�m� volba `%s'\n"
 
-#: tools/gpg-connect-agent.c:466
+#: tools/gpg-connect-agent.c:465
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "podeps�n� selhalo: %s\n"
 
-#: tools/gpg-connect-agent.c:474
+#: tools/gpg-connect-agent.c:473
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "�ten� ve�ejn�ho kl��e se nezda�ilo: %s\n"
 
-#: tools/gpg-connect-agent.c:784
+#: tools/gpg-connect-agent.c:789
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:793
+#: tools/gpg-connect-agent.c:798
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "chyba p�i hled�n� z�znamu d�v�ryhodnosti v `%s': %s\n"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
+#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
-#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
+#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
-#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:501
+#: tools/gpgconf-comp.c:492
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:505
+#: tools/gpgconf-comp.c:496
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:509
+#: tools/gpgconf-comp.c:500
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:510
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:638
+#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#, fuzzy
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|JM�NO|�ifrovat pro JM�NO"
+
+#: tools/gpgconf-comp.c:635
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:640
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:685
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:705
+#: tools/gpgconf-comp.c:708
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:749
+#: tools/gpgconf-comp.c:752
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:785
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:806
+#: tools/gpgconf-comp.c:809
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:814
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:848
+#: tools/gpgconf-comp.c:851
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2681
+#: tools/gpgconf-comp.c:2684
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index bb6d66030..ec85943a0 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-07-05 18:01+0200\n"
+"POT-Creation-Date: 2007-08-10 15:49+0200\n"
 "PO-Revision-Date: 2003-12-03 16:11+0100\n"
 "Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -22,51 +22,51 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: agent/call-pinentry.c:426
+#: agent/call-pinentry.c:436
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:429
+#: agent/call-pinentry.c:439
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 
-#: agent/call-pinentry.c:476
+#: agent/call-pinentry.c:486
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
+#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
 msgid "PIN too long"
 msgstr ""
 
-#: agent/call-pinentry.c:497
+#: agent/call-pinentry.c:507
 msgid "Passphrase too long"
 msgstr ""
 
-#: agent/call-pinentry.c:505
+#: agent/call-pinentry.c:515
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:520
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:522
+#: agent/call-pinentry.c:532
 #, fuzzy
 msgid "Bad PIN"
 msgstr "d�rlig mpi"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:533
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "d�rlig kodes�tning"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:569
 #, fuzzy
 msgid "Passphrase"
 msgstr "d�rlig kodes�tning"
@@ -83,14 +83,14 @@ msgstr "valgte cifferalgoritme %d er ugyldig\n"
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
 #: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
-#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1796
+#: sm/gpgsm.c:1833 sm/gpgsm.c:1871 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
@@ -179,35 +179,46 @@ msgstr[1] ""
 msgid "Take this one anyway"
 msgstr "Brug denne n�gle alligevel? "
 
-#: agent/genkey.c:99
+#: agent/genkey.c:99 agent/genkey.c:114
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Indtast kodes�tning: "
 
-#: agent/genkey.c:144
+#: agent/genkey.c:107
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+
+#: agent/genkey.c:113
+msgid "Yes, protection is not needed"
+msgstr ""
+
+#: agent/genkey.c:158
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
+#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
 #: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:263
+#: agent/genkey.c:280
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -217,245 +228,245 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:103
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
-#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
 #: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "meddelsom"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
-#: sm/gpgsm.c:337
+#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "v�r mere stille"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:109
+#: agent/gpg-agent.c:118 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:119
+#: agent/gpg-agent.c:125 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:125
+#: agent/gpg-agent.c:126
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:129
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "opdat�r tillidsdatabasen"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:145
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:206 sm/gpgsm.c:525 tools/gpg-connect-agent.c:124
 #: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Rapport�r venligst fejl til <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:262
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
+#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
-#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:340 sm/gpgsm.c:772 sm/gpgsm.c:775 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
+#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:863
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
-#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: scd/scdaemon.c:421 sm/gpgsm.c:867 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
+#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:874
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, fuzzy, c-format
 msgid "error creating `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
-#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:921
+#: agent/gpg-agent.c:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
+#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:908
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
+#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
+#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
+#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
+#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: mappe oprettet\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1377
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1381
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1497
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1519
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
+#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
+#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: udelod: %s\n"
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1752
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:751
+#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
-#: tools/gpg-connect-agent.c:762
+#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:767
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
@@ -516,42 +527,42 @@ msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 msgid "cancelled\n"
 msgstr ""
 
-#: agent/trustlist.c:131 agent/trustlist.c:319
+#: agent/trustlist.c:132 agent/trustlist.c:322
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/trustlist.c:146
+#: agent/trustlist.c:147
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: agent/trustlist.c:166 agent/trustlist.c:174
+#: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:180
+#: agent/trustlist.c:181
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: agent/trustlist.c:215
+#: agent/trustlist.c:216
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "panser: %s\n"
 
-#: agent/trustlist.c:241 agent/trustlist.c:248
+#: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:280
+#: agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/trustlist.c:381 agent/trustlist.c:420
+#: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -564,7 +575,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:496
+#: agent/trustlist.c:507
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -574,7 +585,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:505
+#: agent/trustlist.c:516
 msgid "Correct"
 msgstr ""
 
@@ -586,58 +597,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:525
+#: agent/trustlist.c:536
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 #, fuzzy
 msgid "Yes"
 msgstr "ja"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:393
+#: common/exechelp.c:302 common/exechelp.c:390
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: common/exechelp.c:369 common/exechelp.c:426
+#: common/exechelp.c:366 common/exechelp.c:423
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: common/exechelp.c:405 common/exechelp.c:635
+#: common/exechelp.c:402 common/exechelp.c:632
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: common/exechelp.c:461 common/exechelp.c:504
+#: common/exechelp.c:458 common/exechelp.c:501
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:469
+#: common/exechelp.c:466
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: common/exechelp.c:475 common/exechelp.c:515
+#: common/exechelp.c:472 common/exechelp.c:512
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: common/exechelp.c:510
+#: common/exechelp.c:507
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:521
+#: common/exechelp.c:518
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
@@ -656,24 +667,24 @@ msgstr "%s: bruger ikke fundet\n"
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: common/simple-pwquery.c:376
+#: common/simple-pwquery.c:373
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: common/simple-pwquery.c:387
+#: common/simple-pwquery.c:384
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:397
+#: common/simple-pwquery.c:394
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+#: common/simple-pwquery.c:557 common/simple-pwquery.c:653
 msgid "canceled by user\n"
 msgstr ""
 
-#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+#: common/simple-pwquery.c:572 common/simple-pwquery.c:659
 msgid "problem with the agent\n"
 msgstr ""
 
@@ -852,7 +863,7 @@ msgstr "ingen gyldig OpenPGP data fundet.\n"
 msgid "not human readable"
 msgstr ""
 
-#: g10/card-util.c:62 g10/card-util.c:305
+#: g10/card-util.c:62 g10/card-util.c:308
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
@@ -862,166 +873,166 @@ msgstr "hemmelig n�gle ikke tilg�ngelig"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1391 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr ""
 
-#: g10/card-util.c:102 g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
 #: g10/keygen.c:1644
 msgid "Your selection? "
 msgstr "Dit valg? "
 
-#: g10/card-util.c:215 g10/card-util.c:265
+#: g10/card-util.c:218 g10/card-util.c:268
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:412
+#: g10/card-util.c:415
 #, fuzzy
 msgid "male"
 msgstr "sl�til"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 #, fuzzy
 msgid "female"
 msgstr "sl�til"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 #, fuzzy
 msgid "not forced"
 msgstr "ikke bearbejdet"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:521
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:523
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:525
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:539
+#: g10/card-util.c:542
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:544
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:562
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:580
+#: g10/card-util.c:583
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/card-util.c:588
+#: g10/card-util.c:591
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
+#: g10/card-util.c:689 g10/card-util.c:758 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/card-util.c:694
+#: g10/card-util.c:697
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:704
+#: g10/card-util.c:707
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:763
+#: g10/card-util.c:766
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:773
+#: g10/card-util.c:776
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:793
+#: g10/card-util.c:796
 #, fuzzy
 msgid "Language preferences: "
 msgstr "vis pr�ferencer"
 
-#: g10/card-util.c:801
+#: g10/card-util.c:804
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:813
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/card-util.c:831
+#: g10/card-util.c:834
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:845
+#: g10/card-util.c:848
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/card-util.c:866
+#: g10/card-util.c:869
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingeraftryk:"
 
-#: g10/card-util.c:889
+#: g10/card-util.c:892
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/card-util.c:937
+#: g10/card-util.c:940
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:941
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/card-util.c:947
+#: g10/card-util.c:950
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/card-util.c:1031
+#: g10/card-util.c:1034
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/card-util.c:1051 g10/card-util.c:1060
+#: g10/card-util.c:1054 g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1075
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1084
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1029,136 +1040,136 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1115
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/card-util.c:1117 g10/card-util.c:1194
+#: g10/card-util.c:1120 g10/card-util.c:1197
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/card-util.c:1118 g10/card-util.c:1196
+#: g10/card-util.c:1121 g10/card-util.c:1199
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1198
+#: g10/card-util.c:1122 g10/card-util.c:1201
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1135 g10/card-util.c:1214 g10/keyedit.c:945
+#: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
 #: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
-#: g10/card-util.c:1191
+#: g10/card-util.c:1194
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/card-util.c:1226
+#: g10/card-util.c:1229
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "ukendt kompressionsalgoritme"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1234
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1239
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/card-util.c:1304 g10/keyedit.c:1362
+#: g10/card-util.c:1307 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1309
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1307 g10/keyedit.c:1365
+#: g10/card-util.c:1310 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "vis denne hj�lp"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1312
 #, fuzzy
 msgid "list all available data"
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/card-util.c:1312
+#: g10/card-util.c:1315
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1313
+#: g10/card-util.c:1316
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1317
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1315
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "change the login name"
 msgstr "�ndr udl�bsdatoen"
 
-#: g10/card-util.c:1316
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "change the language preferences"
 msgstr "vis pr�ferencer"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1320
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1322
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1323
 #, fuzzy
 msgid "generate new keys"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1324
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1325
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442 g10/keyedit.c:1634
+#: g10/card-util.c:1445 g10/keyedit.c:1634
 msgid "Command> "
 msgstr ""
 
-#: g10/card-util.c:1480
+#: g10/card-util.c:1483
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1511
+#: g10/card-util.c:1514
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1513
+#: g10/card-util.c:1516
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/card-util.c:1587 g10/keyedit.c:2255
+#: g10/card-util.c:1590 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
@@ -1166,7 +1177,7 @@ msgstr ""
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �bne `%s'\n"
@@ -1458,7 +1469,7 @@ msgstr "bruger sekund�r n�gle %08lX istedetfor prim�r n�gle %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1474,27 +1485,27 @@ msgstr "|[filer]|opret en signatur"
 msgid "|[file]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/gpg.c:372 sm/gpgsm.c:244
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "krypt�r data"
 
-#: g10/gpg.c:375 sm/gpgsm.c:246
+#: g10/gpg.c:375 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "krypt�r kun med symmetriske cifre"
 
-#: g10/gpg.c:377 sm/gpgsm.c:247
+#: g10/gpg.c:377 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "afkrypt�r data (standard)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:248
+#: g10/gpg.c:379 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/gpg.c:381 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "vis n�gler"
 
@@ -1507,11 +1518,11 @@ msgstr "vis n�gler og signaturer"
 msgid "list and check key signatures"
 msgstr "tjek n�glesignaturer"
 
-#: g10/gpg.c:385 sm/gpgsm.c:254
+#: g10/gpg.c:385 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/gpg.c:386 sm/gpgsm.c:252
+#: g10/gpg.c:386 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "vis hemmelige n�gler"
 
@@ -1549,11 +1560,11 @@ msgstr "Gener�r en annull�rbar certifikat"
 msgid "export keys"
 msgstr "eksport�r n�gler"
 
-#: g10/gpg.c:397 sm/gpgsm.c:257
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "import�r n�gler fra en n�gleserver"
 
@@ -1591,11 +1602,11 @@ msgstr "opdat�r tillidsdatabasen"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|print meddelelsesresum�"
 
-#: g10/gpg.c:430 sm/gpgsm.c:262
+#: g10/gpg.c:430 sm/gpgsm.c:264
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
 #: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1606,31 +1617,31 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:279
+#: g10/gpg.c:434 sm/gpgsm.c:281
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/gpg.c:436 sm/gpgsm.c:291
+#: g10/gpg.c:436 sm/gpgsm.c:293
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|krypt�r for NAME"
 
-#: g10/gpg.c:447 sm/gpgsm.c:327
+#: g10/gpg.c:447 sm/gpgsm.c:331
 msgid "use this user-id to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/gpg.c:448 sm/gpgsm.c:330
+#: g10/gpg.c:448 sm/gpgsm.c:334
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:332
+#: g10/gpg.c:453 sm/gpgsm.c:336
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "lav ingen �ndringer"
 
@@ -1646,13 +1657,13 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:393
+#: g10/gpg.c:553 sm/gpgsm.c:397
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:556 sm/gpgsm.c:396
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1691,7 +1702,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:532
+#: g10/gpg.c:781 sm/gpgsm.c:538
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1720,7 +1731,7 @@ msgstr "Kommentar: "
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:669
+#: g10/gpg.c:1045 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
@@ -1796,469 +1807,469 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1544
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1552
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1562
+#: 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:1564
+#: g10/gpg.c:1562
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1827
+#: g10/gpg.c:1825
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1981
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
+#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/gpg.c:2401 g10/gpg.c:2413
+#: g10/gpg.c:2399 g10/gpg.c:2411
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2493
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4084
+#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2528
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2531
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2538
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2541
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2548
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2551
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2558
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2561
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2569
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2571
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2573
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2575
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2579
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2581
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2585
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2587
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2589
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2591
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2598
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2608
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2782
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2787
+#: g10/gpg.c:2785
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2873 sm/gpgsm.c:1220
+#: g10/gpg.c:2871 sm/gpgsm.c:1247
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2875
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2884
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2887
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2902
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/gpg.c:2918
+#: g10/gpg.c:2916
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2922
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2930
+#: g10/gpg.c:2928
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2943
+#: g10/gpg.c:2941
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
+#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1303
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
+#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1311
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3025
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3040
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3042
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3044
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3046
 #, 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:3050
+#: g10/gpg.c:3048
 #, 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:3053
+#: g10/gpg.c:3051
 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:3057
+#: g10/gpg.c:3055
 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:3064
+#: g10/gpg.c:3062
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3071
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3075
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3079
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3114
+#: g10/gpg.c:3112
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3159
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3164
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3171
+#: g10/gpg.c:3169
 #, 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:3263
+#: g10/gpg.c:3261
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3272
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3295
+#: g10/gpg.c:3293
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3300
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3302
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3312
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3325
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3327
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3332
+#: g10/gpg.c:3330
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3348
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3361
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3376
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3378
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3381
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3401
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3410
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3435
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3443
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3447
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3468
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3553
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3555
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3557
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3568
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/gpg.c:3580
+#: g10/gpg.c:3578
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3631
+#: g10/gpg.c:3629
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3639
+#: g10/gpg.c:3637
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3729
+#: g10/gpg.c:3727
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3844
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3850
+#: g10/gpg.c:3848
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4160
 #, 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:4162
 #, 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:4195
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
@@ -2273,7 +2284,7 @@ msgstr "Slet denne n�gle fra n�gleringen? "
 msgid "make timestamp conflicts only a warning"
 msgstr "tidsstempelkonflikt"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:368
+#: g10/gpgv.c:75 sm/gpgsm.c:372
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinfo til denne FD"
 
@@ -6506,64 +6517,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: scd/scdaemon.c:105
+#: scd/scdaemon.c:108
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:357
+#: scd/scdaemon.c:114 sm/gpgsm.c:361
 #, fuzzy
 msgid "read options from file"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:124
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:129
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "brug overhovedet ikke terminalen"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:134
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:135
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "konfliktende kommandoer\n"
 
-#: scd/scdaemon.c:206
+#: scd/scdaemon.c:209
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: scd/scdaemon.c:208
+#: scd/scdaemon.c:211
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:671
+#: scd/scdaemon.c:658
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1019
+#: scd/scdaemon.c:1006
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1024
+#: scd/scdaemon.c:1011
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6591,145 +6602,259 @@ msgstr "valgte cifferalgoritme %d er ugyldig\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:174
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr ""
+
+#: sm/certchain.c:195
+msgid "chain"
+msgstr ""
+
+#: sm/certchain.c:196
+#, fuzzy
+msgid "shell"
+msgstr "hj�lp"
+
+#: sm/certchain.c:241
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: sm/certchain.c:212
+#: sm/certchain.c:279
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:250
+#: sm/certchain.c:317
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:260
+#: sm/certchain.c:327
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: sm/certchain.c:267 sm/certchain.c:296
+#: sm/certchain.c:334 sm/certchain.c:363
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:271 sm/certchain.c:300
+#: sm/certchain.c:338 sm/certchain.c:367
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: sm/certchain.c:411
+#: sm/certchain.c:478
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:431
+#: sm/certchain.c:498
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
 # er det klogt at overs�tte TrustDB?
-#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: sm/certchain.c:675
+#: sm/certchain.c:742
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "n�gle %08lX: n�gle er blevet annulleret!\n"
 
-#: sm/certchain.c:684
+#: sm/certchain.c:752
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Godt certifikat"
 
-#: sm/certchain.c:688
+#: sm/certchain.c:757
+msgid "the status of the certificate is unknown"
+msgstr ""
+
+#: sm/certchain.c:762
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: sm/certchain.c:690
+#: sm/certchain.c:764
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:695
+#: sm/certchain.c:770
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: sm/certchain.c:791
-#, fuzzy
-msgid "no issuer found in certificate"
-msgstr "Godt certifikat"
-
-#: sm/certchain.c:820
+#: sm/certchain.c:799 sm/certchain.c:867
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certifikatl�seproblem: %s\n"
 
-#: sm/certchain.c:836
+#: sm/certchain.c:814 sm/certchain.c:899
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:849
+#: sm/certchain.c:815 sm/certchain.c:900
+#, fuzzy
+msgid "root certificate not yet valid"
+msgstr "skriver hemmeligt certifikat til '%s'\n"
+
+#: sm/certchain.c:816 sm/certchain.c:901
+msgid "intermediate certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:829
 #, fuzzy
 msgid "certificate has expired"
 msgstr "certifikatl�seproblem: %s\n"
 
-#: sm/certchain.c:892
-msgid "self-signed certificate has a BAD signature"
+#: sm/certchain.c:830
+#, fuzzy
+msgid "root certificate has expired"
+msgstr "certifikatl�seproblem: %s\n"
+
+#: sm/certchain.c:831
+#, fuzzy
+msgid "intermediate certificate has expired"
+msgstr "certifikatl�seproblem: %s\n"
+
+#: sm/certchain.c:873
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:960
-msgid "root certificate is not marked trusted"
+#: sm/certchain.c:882
+#, fuzzy
+msgid "certificate with invalid validity"
+msgstr "certifikatl�seproblem: %s\n"
+
+#: sm/certchain.c:919
+msgid "signature not created during lifetime of certificate"
+msgstr ""
+
+#: sm/certchain.c:921
+msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:975
+#: sm/certchain.c:922
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:926
+#, fuzzy
+msgid "  (  signature created at "
+msgstr "        nye signaturer: %lu\n"
+
+#: sm/certchain.c:927
+#, fuzzy
+msgid "  (certificate created at "
+msgstr "n�gle %08lX: offentlig n�gle importeret\n"
+
+#: sm/certchain.c:930
+#, fuzzy
+msgid "  (certificate valid from "
+msgstr "certifikatl�seproblem: %s\n"
+
+#: sm/certchain.c:931
+msgid "  (     issuer valid from "
+msgstr ""
+
+#: sm/certchain.c:961
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Fingeraftryk:"
 
-#: sm/certchain.c:983
+#: sm/certchain.c:970
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:998
+#: sm/certchain.c:983
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1004
+#: sm/certchain.c:989
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1046
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr ""
+
+#: sm/certchain.c:1110
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "Godt certifikat"
+
+#: sm/certchain.c:1184
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:1253
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:1266
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: sm/certchain.c:1041 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:157
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "certifikatl�seproblem: %s\n"
 
-#: sm/certchain.c:1053
+#: sm/certchain.c:1307
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1086
+#: sm/certchain.c:1340
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "godkend en signatur"
 
-#: sm/certchain.c:1116
+#: sm/certchain.c:1371
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1167
+#: sm/certchain.c:1422
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
+#: sm/certchain.c:1462 sm/certchain.c:1730
+#, fuzzy
+msgid "certificate is good\n"
+msgstr "certifikatl�seproblem: %s\n"
+
+#: sm/certchain.c:1463
+#, fuzzy
+msgid "intermediate certificate is good\n"
+msgstr "n�gle %08lX: offentlig n�gle importeret\n"
+
+#: sm/certchain.c:1464
+#, fuzzy
+msgid "root certificate is good\n"
+msgstr "Godt certifikat"
+
+#: sm/certchain.c:1620
+msgid "switching to chain model"
+msgstr ""
+
+#: sm/certchain.c:1629
+#, c-format
+msgid "validation model used: %s"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "chain model"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "shell model"
+msgstr ""
+
 #: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
@@ -6777,7 +6902,7 @@ msgstr "fejl i trailerlinie\n"
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
 "\"%s\"\n"
-"S/N %s, ID %08lX, created %s"
+"S/N %s, ID 0x%08lX, created %s"
 msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
@@ -6786,7 +6911,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:131 sm/keylist.c:255
+#: sm/certlist.c:131 sm/keylist.c:258
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
@@ -6908,182 +7033,182 @@ msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "skriver til `%s'\n"
 
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: sm/gpgsm.c:251
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list external keys"
 msgstr "vis hemmelige n�gler"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list certificate chain"
 msgstr "ugyldigt certifikat"
 
-#: sm/gpgsm.c:256
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "fjern n�gle fra den offentlige n�glering"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "import certificates"
 msgstr "Godt certifikat"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:262
 #, fuzzy
 msgid "export certificates"
 msgstr "Godt certifikat"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:268
 #, fuzzy
 msgid "change a passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "opret ascii beskyttet uddata"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:287
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:296
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:302
+#: sm/gpgsm.c:304
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:305
+#: sm/gpgsm.c:309
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:312
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:315
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:319
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:323
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:325
 msgid "use the default key as default recipient"
 msgstr "brug standard n�glen som standard modtager"
 
-#: sm/gpgsm.c:338
+#: sm/gpgsm.c:342
 msgid "don't use the terminal at all"
 msgstr "brug overhovedet ikke terminalen"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:346
 msgid "force v3 signatures"
 msgstr "tving v3 signaturer"
 
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:347
 msgid "always use a MDC for encryption"
 msgstr "brug altid en MDC for kryptering"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:352
 msgid "batch mode: never ask"
 msgstr "k�rselsmodus: sp�rg aldrig"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:353
 msgid "assume yes on most questions"
 msgstr "forvent ja til de fleste spr�gsm�l"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:354
 msgid "assume no on most questions"
 msgstr "forvent nej til de fleste spr�gsm�l"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:356
 msgid "add this keyring to the list of keyrings"
 msgstr "tilf�j denne n�glering til n�gleringslisten"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:357
 msgid "add this secret keyring to the list"
 msgstr "tilf�j denne hemmeligen�glering til listen"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|brug NAME som standard hemmelign�gle"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:359
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|brug denne n�gletjener til at sl� n�gler op"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:360
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|s�t terminal karakters�t til NAME"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:364
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:375
+#: sm/gpgsm.c:379
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: sm/gpgsm.c:381
+#: sm/gpgsm.c:385
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|brug cifferalgoritme NAME"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:387
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|brug meddelelsesresum� algoritme NAME"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:389
 msgid "|N|use compress algorithm N"
 msgstr "|N|brug kompresalgoritme N"
 
-#: sm/gpgsm.c:522
+#: sm/gpgsm.c:528
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
 # Skal alt dette overs�ttes eller er det flagene?
-#: sm/gpgsm.c:525
+#: sm/gpgsm.c:531
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7094,31 +7219,36 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: sm/gpgsm.c:604
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "brug: gpg [flag] "
 
-#: sm/gpgsm.c:685
+#: sm/gpgsm.c:691
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: sm/gpgsm.c:1237
+#: sm/gpgsm.c:713
+#, fuzzy, c-format
+msgid "unknown validation model `%s'\n"
+msgstr "ukendt standard modtager '%s'\n"
+
+#: sm/gpgsm.c:1264
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1316
+#: sm/gpgsm.c:1344
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: sm/gpgsm.c:1334
+#: sm/gpgsm.c:1362
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: sm/gpgsm.c:1529
+#: sm/gpgsm.c:1543
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7141,7 +7271,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:375
+#: sm/import.c:541 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
@@ -7227,7 +7357,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234
+#: sm/qualified.c:234 sm/verify.c:536
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7246,30 +7376,35 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: sm/verify.c:386
+#: sm/verify.c:388
 #, fuzzy
 msgid "Signature made "
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: sm/verify.c:390
+#: sm/verify.c:392
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:391
-#, c-format
-msgid " using certificate ID %08lX\n"
-msgstr ""
+#: sm/verify.c:393
+#, fuzzy, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: sm/verify.c:507
+#: sm/verify.c:514
 #, fuzzy
 msgid "Good signature from"
 msgstr "God signatur fra \""
 
-#: sm/verify.c:508
+#: sm/verify.c:515
 #, fuzzy
 msgid "                aka"
 msgstr "              alias \""
 
+#: sm/verify.c:533
+#, fuzzy
+msgid "This is a qualified signature\n"
+msgstr "skriver selvsignatur\n"
+
 #: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
@@ -7306,133 +7441,138 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:315
+#: tools/gpg-connect-agent.c:314
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:323
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:382
+#: tools/gpg-connect-agent.c:381
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: tools/gpg-connect-agent.c:386
+#: tools/gpg-connect-agent.c:385
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:458
+#: tools/gpg-connect-agent.c:457
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: tools/gpg-connect-agent.c:466
+#: tools/gpg-connect-agent.c:465
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: tools/gpg-connect-agent.c:474
+#: tools/gpg-connect-agent.c:473
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: tools/gpg-connect-agent.c:784
+#: tools/gpg-connect-agent.c:789
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: tools/gpg-connect-agent.c:793
+#: tools/gpg-connect-agent.c:798
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
+#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
-#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
+#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "sl� fuld fejltjekning til"
 
-#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
-#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:501
+#: tools/gpgconf-comp.c:492
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:505
+#: tools/gpgconf-comp.c:496
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:509
+#: tools/gpgconf-comp.c:500
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:510
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:638
+#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#, fuzzy
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAME|krypt�r for NAME"
+
+#: tools/gpgconf-comp.c:635
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:640
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|brug cifrealgoritme NAME for pasfrase"
 
-#: tools/gpgconf-comp.c:705
+#: tools/gpgconf-comp.c:708
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:749
+#: tools/gpgconf-comp.c:752
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:785
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:806
+#: tools/gpgconf-comp.c:809
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:814
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:848
+#: tools/gpgconf-comp.c:851
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2681
+#: tools/gpgconf-comp.c:2684
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -7996,9 +8136,6 @@ msgstr "valgte cifferalgoritme %d er ugyldig\n"
 #~ msgid "q"
 #~ msgstr "a"
 
-#~ msgid "help"
-#~ msgstr "hj�lp"
-
 #~ msgid "list"
 #~ msgstr "vis"
 
diff --git a/po/de.po b/po/de.po
index 4b597fb42..877dfdbcb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.9.90\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-07-05 18:01+0200\n"
+"POT-Creation-Date: 2007-08-10 15:49+0200\n"
 "PO-Revision-Date: 2007-07-04 21:44+0200\n"
 "Last-Translator: Walter Koch <koch@u32.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "Die Sperre für das Pinentry kann nicht gesetzt werden: %s\n"
 
-#: agent/call-pinentry.c:426
+#: agent/call-pinentry.c:436
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -31,7 +31,7 @@ msgstr ""
 "Bitte geben Sie Ihre PIN ein, so daß der geheime Schlüssel benutzt werden "
 "kann"
 
-#: agent/call-pinentry.c:429
+#: agent/call-pinentry.c:439
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -39,36 +39,36 @@ msgstr ""
 "Bitte geben Sie Ihre Passphrase ein, so daß der geheime Schlüssel benutzt "
 "werden kann"
 
-#: agent/call-pinentry.c:476
+#: agent/call-pinentry.c:486
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (Versuch %d von %d)"
 
-#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
+#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
 msgid "PIN too long"
 msgstr "Die PIN ist zu lang"
 
-#: agent/call-pinentry.c:497
+#: agent/call-pinentry.c:507
 msgid "Passphrase too long"
 msgstr "Das Mantra (Passphrase) ist zu lang"
 
-#: agent/call-pinentry.c:505
+#: agent/call-pinentry.c:515
 msgid "Invalid characters in PIN"
 msgstr "Ungültige Zeichen in der PIN"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:520
 msgid "PIN too short"
 msgstr "Die PIN ist zu kurz"
 
-#: agent/call-pinentry.c:522
+#: agent/call-pinentry.c:532
 msgid "Bad PIN"
 msgstr "Falsche PIN"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:533
 msgid "Bad Passphrase"
 msgstr "Falsche Passphrase"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:569
 msgid "Passphrase"
 msgstr "Passphrase"
 
@@ -84,14 +84,14 @@ msgstr "SSH Schlüssel von mehr als %d Bits werden nicht unterstützt\n"
 msgid "can't create `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
 #: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
-#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1796
+#: sm/gpgsm.c:1833 sm/gpgsm.c:1871 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
@@ -181,30 +181,41 @@ msgstr[1] ""
 msgid "Take this one anyway"
 msgstr "Diese trotzdem benutzen"
 
-#: agent/genkey.c:99
+#: agent/genkey.c:99 agent/genkey.c:114
 msgid "Enter new passphrase"
 msgstr "Neue Passphrase eingeben"
 
-#: agent/genkey.c:144
+#: agent/genkey.c:107
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+
+#: agent/genkey.c:113
+msgid "Yes, protection is not needed"
+msgstr ""
+
+#: agent/genkey.c:158
 #, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr "Bitte geben Sie die Passphrase ein%0Aum Ihren Schlüssel zu schützen"
 
-#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
+#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
 msgid "Please re-enter this passphrase"
 msgstr "Bitte geben Sie die Passphrase noch einmal ein:"
 
-#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
 #: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr "Keine Übereinstimmung - bitte nochmal versuchen"
 
-#: agent/genkey.c:263
+#: agent/genkey.c:280
 msgid "Please enter the new passphrase"
 msgstr "Bitte geben Sie die Passphrase ein:"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:104
 msgid ""
 "@Options:\n"
 " "
@@ -212,109 +223,109 @@ msgstr ""
 "@Optionen:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:103
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr "Im Server Modus ausführen"
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr "Im Daemon Modus ausführen"
 
-#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
-#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
 #: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
-#: sm/gpgsm.c:337
+#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:109
+#: agent/gpg-agent.c:118 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr "Ausgabe für /bin/sh"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr "Ausgabe für /bin/csh"
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:119
+#: agent/gpg-agent.c:125 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr "Im Vordergrund laufen lassen"
 
-#: agent/gpg-agent.c:125
+#: agent/gpg-agent.c:126
 msgid "do not grab keyboard and mouse"
 msgstr "Tastatur und Maus nicht \"grabben\""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "Logausgaben in eine Datei umlenken"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:129
 msgid "use a standard location for the socket"
 msgstr "Benutze einen Standardnamen für den Socket"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|benutze PGM as PIN-Entry"
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|benutze PGM as SCdaemon"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 msgid "do not use the SCdaemon"
 msgstr "Den Scdaemon-basierten Kartenzugriff nicht nutzen"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "ignore requests to change the TTY"
 msgstr "Ignoriere Anfragen, das TTY zu wechseln"
 
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:145
 msgid "ignore requests to change the X display"
 msgstr "Ignoriere Anfragen, das X-Display zu wechseln"
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|lasse PINs im Cache nach N Sekunden verfallen"
 
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr "benutze PINs im Cache nicht bem Signieren"
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "erlaube Aufrufern Schlüssel als \"vertrauenswürdig\" zu markieren"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:158
 msgid "allow presetting passphrase"
 msgstr "erlaube ein \"preset\" von Passphrases"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr "Die ssh-agent-Emulation anschalten"
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|DATEI|Schreibe die Umgebungsvariabeln auf DATEI"
 
-#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:206 sm/gpgsm.c:525 tools/gpg-connect-agent.c:124
 #: tools/gpgconf.c:89 tools/symcryptrun.c:204
 msgid "Please report bugs to <"
 msgstr "Fehlerberichte bitte an <"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:260
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Aufruf: gpg-agent [Optionen] (-h für Hilfe)"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:262
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -322,130 +333,130 @@ msgstr ""
 "Syntax: gpg-agent [Optionen] [Befehl [Argumente]]\n"
 "Verwaltung von geheimen Schlüsseln für GnuPG\n"
 
-#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
+#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "ungültige Debugebene `%s' angegeben\n"
 
-#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
-#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:340 sm/gpgsm.c:772 sm/gpgsm.c:775 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "Die Bibliothek %s ist nicht aktuell (benötige %s, habe %s)\n"
 
-#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
+#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:863
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
-#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: scd/scdaemon.c:421 sm/gpgsm.c:867 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
+#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:874
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Fehler beim Erstellen von `%s': %s\n"
 
-#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
-#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:921
+#: agent/gpg-agent.c:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
+#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:908
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "Verzeichnis `%s' kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
+#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr "Der Name des Sockets ist zu lang\n"
 
-#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "Socket kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "Ein gpg-agent läuft bereits - ein weiterer wird nicht gestartet\n"
 
-#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
+#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "Der Socket kann nicht an `%s' gebunden werden: %s\n"
 
-#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
+#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "Der listen()-Aufruf ist fehlgeschlagen: %s\n"
 
-#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "Es wird auf Socket `%s' gehört\n"
 
-#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
+#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "Verzeichnis `%s' erzeugt\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1377
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat()-Aufruf für `%s' fehlgeschlagen: %s\n"
 
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1381
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "Die Datei `%s' kann nicht als Home-Verzeichnis benutzt werden\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "Handhabungsroutine 0x%lx für fd %d gestartet\n"
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1497
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "Handhabungsroutine 0x%lx für den fd %d beendet\n"
 
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "SSH-Handhabungsroutine 0x%lx für fd %d gestartet\n"
 
-#: agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1519
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "SSH-Handhabungsroutine 0x%lx für fd %d beendet\n"
 
-#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
+#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
 
-#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
+#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s angehalten\n"
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1752
 msgid "no gpg-agent running in this session\n"
 msgstr "Der gpg-agent läuft nicht für diese Session\n"
 
-#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:751
+#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
 
-#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
-#: tools/gpg-connect-agent.c:762
+#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "GPG-Agent-Protokoll-Version %d wird nicht unterstützt\n"
@@ -512,45 +523,45 @@ msgstr "Fehler bei der Abfrage der Passphrase: %s\n"
 msgid "cancelled\n"
 msgstr "Vom Benutzer abgebrochen\n"
 
-#: agent/trustlist.c:131 agent/trustlist.c:319
+#: agent/trustlist.c:132 agent/trustlist.c:322
 #, c-format
 msgid "error opening `%s': %s\n"
 msgstr "Fehler beim Öffnen von `%s': %s\n"
 
-#: agent/trustlist.c:146
+#: agent/trustlist.c:147
 #, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "Datei `%s', Zeile %d: %s\n"
 
-#: agent/trustlist.c:166 agent/trustlist.c:174
+#: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 "Anweisung \"%s\" in `%s', Zeile %d\n"
 " ignoriert\n"
 
-#: agent/trustlist.c:180
+#: agent/trustlist.c:181
 #, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr ""
 "Systemliste der vertrauenswürdigen Zertifikate '%s' ist nicht vorhanden\n"
 
-#: agent/trustlist.c:215
+#: agent/trustlist.c:216
 #, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "fehlerhafter Fingerabdruck in `%s', Zeile %d\n"
 
-#: agent/trustlist.c:241 agent/trustlist.c:248
+#: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr "Ungültiger Schlüsselflag in `%s', Zeile %d\n"
 
-#: agent/trustlist.c:280
+#: agent/trustlist.c:283
 #, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "Fehler beim Lesen von `%s', Zeile %d: %s\n"
 
-#: agent/trustlist.c:381 agent/trustlist.c:420
+#: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
 msgstr "Fehler beim Lesen der Liste vertrauenswürdiger root-Zertifikate\n"
 
@@ -563,7 +574,7 @@ msgstr "Fehler beim Lesen der Liste vertrauenswürdiger root-Zertifikate\n"
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:496
+#: agent/trustlist.c:507
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -575,7 +586,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:505
+#: agent/trustlist.c:516
 msgid "Correct"
 msgstr "Korrekt"
 
@@ -587,7 +598,7 @@ msgstr "Korrekt"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:525
+#: agent/trustlist.c:536
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -596,50 +607,50 @@ msgstr ""
 "Wenn Sie vollständiges Vertrauen haben, daß%%0A  \"%s\"%%"
 "0ABenutzerzertifikate verläßlich zertifiziert, so antworten Sie mit \"Ja\""
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "No"
 msgstr "Nein"
 
-#: common/exechelp.c:302 common/exechelp.c:393
+#: common/exechelp.c:302 common/exechelp.c:390
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "Fehler beim Erzeugen einer \"Pipe\": %s\n"
 
-#: common/exechelp.c:369 common/exechelp.c:426
+#: common/exechelp.c:366 common/exechelp.c:423
 #, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "Pipe kann nicht zum Lesen \"fdopen\"t werden: %s\n"
 
-#: common/exechelp.c:405 common/exechelp.c:635
+#: common/exechelp.c:402 common/exechelp.c:632
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "Fehler beim \"Forken\" des Prozess: %s\n"
 
-#: common/exechelp.c:461 common/exechelp.c:504
+#: common/exechelp.c:458 common/exechelp.c:501
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "Das Warten auf die Beendigung des Prozesses %d schlug fehl: %s\n"
 
-#: common/exechelp.c:469
+#: common/exechelp.c:466
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "Fehler beim Holen des Exitwerte des Prozesses %d: %s\n"
 
-#: common/exechelp.c:475 common/exechelp.c:515
+#: common/exechelp.c:472 common/exechelp.c:512
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "Fehler bei Ausführung von `%s': Endestatus %d\n"
 
-#: common/exechelp.c:510
+#: common/exechelp.c:507
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr "Feler bei Ausführung von `%s': wahrscheinlich nicht installiert\n"
 
-#: common/exechelp.c:521
+#: common/exechelp.c:518
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "Fehler bei Ausführung von `%s': beendet\n"
@@ -657,24 +668,24 @@ msgstr "Host nicht gefunden"
 msgid "gpg-agent is not available in this session\n"
 msgstr "GPG-Agent ist in dieser Sitzung nicht vorhanden\n"
 
-#: common/simple-pwquery.c:376
+#: common/simple-pwquery.c:373
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
 
-#: common/simple-pwquery.c:387
+#: common/simple-pwquery.c:384
 msgid "communication problem with gpg-agent\n"
 msgstr "Kommunikationsproblem mit GPG-Agent\n"
 
-#: common/simple-pwquery.c:397
+#: common/simple-pwquery.c:394
 msgid "problem setting the gpg-agent options\n"
 msgstr "Beim setzen der gpg-agent Optionen ist ein problem aufgetreten\n"
 
-#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+#: common/simple-pwquery.c:557 common/simple-pwquery.c:653
 msgid "canceled by user\n"
 msgstr "Vom Benutzer abgebrochen\n"
 
-#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+#: common/simple-pwquery.c:572 common/simple-pwquery.c:659
 msgid "problem with the agent\n"
 msgstr "Problem mit dem Agenten\n"
 
@@ -852,7 +863,7 @@ msgstr "WARNUNG: Ungültige \"Notation\"-Daten gefunden\n"
 msgid "not human readable"
 msgstr "nicht als Klartext darstellbar"
 
-#: g10/card-util.c:62 g10/card-util.c:305
+#: g10/card-util.c:62 g10/card-util.c:308
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP Karte ist nicht vorhanden: %s\n"
@@ -862,155 +873,155 @@ msgstr "OpenPGP Karte ist nicht vorhanden: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP Karte Nr. %s erkannt\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1391 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
 #: g10/keygen.c:1644
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
-#: g10/card-util.c:215 g10/card-util.c:265
+#: g10/card-util.c:218 g10/card-util.c:268
 msgid "[not set]"
 msgstr "[nicht gesetzt]"
 
-#: g10/card-util.c:412
+#: g10/card-util.c:415
 msgid "male"
 msgstr "männlich"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "female"
 msgstr "weiblich"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "unspecified"
 msgstr "unbestimmt"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "not forced"
 msgstr "nicht zwingend"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "forced"
 msgstr "zwingend"
 
-#: g10/card-util.c:518
+#: g10/card-util.c:521
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Fehler: Nur reines ASCII ist derzeit erlaubt.\n"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:523
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fehler: Das Zeichen \"<\" kann nicht benutzt werden.\n"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:525
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fehler: Doppelte Leerzeichen sind nicht erlaubt.\n"
 
-#: g10/card-util.c:539
+#: g10/card-util.c:542
 msgid "Cardholder's surname: "
 msgstr "Familienname des Kartenbesitzers:"
 
-#: g10/card-util.c:541
+#: g10/card-util.c:544
 msgid "Cardholder's given name: "
 msgstr "Vorname des Kartenbesitzers:"
 
-#: g10/card-util.c:559
+#: g10/card-util.c:562
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 "Fehler: Der zusammengesetzte Name ist zu lang (Grenze beträgt %d Zeichen).\n"
 
-#: g10/card-util.c:580
+#: g10/card-util.c:583
 msgid "URL to retrieve public key: "
 msgstr "URL um den öffentlichen Schlüssel zu holen: "
 
-#: g10/card-util.c:588
+#: g10/card-util.c:591
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Fehler: URL ist zu lang (Grenze beträgt %d Zeichen).\n"
 
-#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
+#: g10/card-util.c:689 g10/card-util.c:758 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Fehler beim Lesen von `%s': %s\n"
 
-#: g10/card-util.c:694
+#: g10/card-util.c:697
 msgid "Login data (account name): "
 msgstr "Logindaten (Kontenname): "
 
-#: g10/card-util.c:704
+#: g10/card-util.c:707
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Fehler: Logindaten sind zu lang (Grenze beträgt %d Zeichen).\n"
 
-#: g10/card-util.c:763
+#: g10/card-util.c:766
 msgid "Private DO data: "
 msgstr "Geheime DO-Daten: "
 
-#: g10/card-util.c:773
+#: g10/card-util.c:776
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Fehler: Geheime DO-Daten sind zu lang (Grenze beträgt %d Zeichen).\n"
 
-#: g10/card-util.c:793
+#: g10/card-util.c:796
 msgid "Language preferences: "
 msgstr "Spracheinstellungen"
 
-#: g10/card-util.c:801
+#: g10/card-util.c:804
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fehler: Ungültige Länge der Einstellungs-Zeichenfolge.\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:813
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fehler: Ungültige Zeichen in der Einstellungs-Zeichenfolge\n"
 
-#: g10/card-util.c:831
+#: g10/card-util.c:834
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Geschlecht: (Männlich (M), Weiblich (F) oder Leerzeichen): "
 
-#: g10/card-util.c:845
+#: g10/card-util.c:848
 msgid "Error: invalid response.\n"
 msgstr "Fehler: ungültige Antwort.\n"
 
-#: g10/card-util.c:866
+#: g10/card-util.c:869
 msgid "CA fingerprint: "
 msgstr "CA-Fingerabdruck: "
 
-#: g10/card-util.c:889
+#: g10/card-util.c:892
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fehler: ungültig geformter Fingerabdruck.\n"
 
-#: g10/card-util.c:937
+#: g10/card-util.c:940
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Schlüsseloperation nicht möglich: %s\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:941
 msgid "not an OpenPGP card"
 msgstr "Keine gültige OpenPGP-Karte"
 
-#: g10/card-util.c:947
+#: g10/card-util.c:950
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "Fehler beim Holen der aktuellen Schlüsselinfo: %s\n"
 
-#: g10/card-util.c:1031
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr "Vorhandenen Schlüssel ersetzen? (j/N) "
 
-#: g10/card-util.c:1051 g10/card-util.c:1060
+#: g10/card-util.c:1054 g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 "Sicherung des Verschlüsselungsschlüssel außerhalb der Karte erstellen? (J/n) "
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1075
 msgid "Replace existing keys? (y/N) "
 msgstr "Vorhandene Schlüssel ersetzen? (j/N) "
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1084
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1021,120 +1032,120 @@ msgstr ""
 "   PIN = `%s'     Admin-PIN = `%s'\n"
 "Sie sollten sie mittels des Befehls --change-pin ändern\n"
 
-#: g10/card-util.c:1115
+#: g10/card-util.c:1118
 msgid "Please select the type of key to generate:\n"
 msgstr "Bitte wählen Sie die Art des Schlüssel, der erzeugt werden soll:\n"
 
-#: g10/card-util.c:1117 g10/card-util.c:1194
+#: g10/card-util.c:1120 g10/card-util.c:1197
 msgid "   (1) Signature key\n"
 msgstr "   (1) Unterschriften-Schlüssel\n"
 
-#: g10/card-util.c:1118 g10/card-util.c:1196
+#: g10/card-util.c:1121 g10/card-util.c:1199
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Verschlüsselungs-Schlüssel\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1198
+#: g10/card-util.c:1122 g10/card-util.c:1201
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Authentisierungs-Schlüssel\n"
 
-#: g10/card-util.c:1135 g10/card-util.c:1214 g10/keyedit.c:945
+#: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
 #: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ungültige Auswahl.\n"
 
-#: g10/card-util.c:1191
+#: g10/card-util.c:1194
 msgid "Please select where to store the key:\n"
 msgstr "Wählen Sie den Speicherort für den Schlüssel:\n"
 
-#: g10/card-util.c:1226
+#: g10/card-util.c:1229
 msgid "unknown key protection algorithm\n"
 msgstr "Unbekanntes Schlüssel-Schutzverfahren\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1234
 msgid "secret parts of key are not available\n"
 msgstr "Geheime Teile des Schlüssels sind nicht vorhanden\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1239
 msgid "secret key already stored on a card\n"
 msgstr "geheimer Schlüssel ist bereits auf einer Karte gespeichert\n"
 
-#: g10/card-util.c:1304 g10/keyedit.c:1362
+#: g10/card-util.c:1307 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "Menü verlassen"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1309
 msgid "show admin commands"
 msgstr "Zeige Admin-Befehle"
 
-#: g10/card-util.c:1307 g10/keyedit.c:1365
+#: g10/card-util.c:1310 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1312
 msgid "list all available data"
 msgstr "Alle vorhandenen Daten auflisten"
 
-#: g10/card-util.c:1312
+#: g10/card-util.c:1315
 msgid "change card holder's name"
 msgstr "Kartenbesitzernamen ändern"
 
-#: g10/card-util.c:1313
+#: g10/card-util.c:1316
 msgid "change URL to retrieve key"
 msgstr "Schlüssel-holen-URL ändern"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1317
 msgid "fetch the key specified in the card URL"
 msgstr "Holen des Schlüssels mittels der URL auf der Karte"
 
-#: g10/card-util.c:1315
+#: g10/card-util.c:1318
 msgid "change the login name"
 msgstr "Ändern der Logindaten"
 
-#: g10/card-util.c:1316
+#: g10/card-util.c:1319
 msgid "change the language preferences"
 msgstr "Ändern der Spracheinstellungen"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1320
 msgid "change card holder's sex"
 msgstr "Ändern des Geschlechts des Kartenbesitzers"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1321
 msgid "change a CA fingerprint"
 msgstr "Ändern des CA-Fingerabdrucks"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1322
 msgid "toggle the signature force PIN flag"
 msgstr "Umschalte des \"Signature-force-PIN\"-Schalters"
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1323
 msgid "generate new keys"
 msgstr "neue Schlüssel erzeugen"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1324
 msgid "menu to change or unblock the PIN"
 msgstr "Menü für Ändern oder Entsperren der PIN"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1325
 msgid "verify the PIN and list all data"
 msgstr "überprüfe die PIN und liste alle Daten auf"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1634
+#: g10/card-util.c:1445 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Befehl> "
 
-#: g10/card-util.c:1480
+#: g10/card-util.c:1483
 msgid "Admin-only command\n"
 msgstr "nur-Admin Befehl\n"
 
-#: g10/card-util.c:1511
+#: g10/card-util.c:1514
 msgid "Admin commands are allowed\n"
 msgstr "Admin-Befehle sind erlaubt\n"
 
-#: g10/card-util.c:1513
+#: g10/card-util.c:1516
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-Befehle sind nicht erlaubt\n"
 
-#: g10/card-util.c:1587 g10/keyedit.c:2255
+#: g10/card-util.c:1590 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
@@ -1142,7 +1153,7 @@ msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Befehl\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht geöffnet werden\n"
@@ -1453,7 +1464,7 @@ msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 "Schlüssel %s: geheimer Schlüssel ohne öffentlichen Schlüssel - übersprungen\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1469,27 +1480,27 @@ msgstr "|[Datei]|Eine Unterschrift erzeugen"
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/gpg.c:372 sm/gpgsm.c:244
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "Daten verschlüsseln"
 
-#: g10/gpg.c:375 sm/gpgsm.c:246
+#: g10/gpg.c:375 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschlüsseln"
 
-#: g10/gpg.c:377 sm/gpgsm.c:247
+#: g10/gpg.c:377 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "Daten entschlüsseln (Voreinstellung)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:248
+#: g10/gpg.c:379 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "Signatur prüfen"
 
-#: g10/gpg.c:381 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "Liste der Schlüssel"
 
@@ -1501,11 +1512,11 @@ msgstr "Liste der Schlüssel und ihrer Signaturen"
 msgid "list and check key signatures"
 msgstr "Signaturen der Schlüssel auflisten und prüfen"
 
-#: g10/gpg.c:385 sm/gpgsm.c:254
+#: g10/gpg.c:385 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
 
-#: g10/gpg.c:386 sm/gpgsm.c:252
+#: g10/gpg.c:386 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "Liste der geheimen Schlüssel"
 
@@ -1541,11 +1552,11 @@ msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
 msgid "export keys"
 msgstr "Schlüssel exportieren"
 
-#: g10/gpg.c:397 sm/gpgsm.c:257
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "Schlüssel zu einem Schlü.server exportieren"
 
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "Schlüssel von einem Schlü.server importieren"
 
@@ -1581,11 +1592,11 @@ msgstr "Ändern der \"Trust\"-Datenbank"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests für die Dateien ausgeben"
 
-#: g10/gpg.c:430 sm/gpgsm.c:262
+#: g10/gpg.c:430 sm/gpgsm.c:264
 msgid "run in server mode"
 msgstr "Im Server Modus ausführen"
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
 #: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1596,31 +1607,31 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:279
+#: g10/gpg.c:434 sm/gpgsm.c:281
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-Hülle versehen"
 
-#: g10/gpg.c:436 sm/gpgsm.c:291
+#: g10/gpg.c:436 sm/gpgsm.c:293
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschlüsseln für NAME"
 
-#: g10/gpg.c:447 sm/gpgsm.c:327
+#: g10/gpg.c:447 sm/gpgsm.c:331
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/gpg.c:448 sm/gpgsm.c:330
+#: g10/gpg.c:448 sm/gpgsm.c:334
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:332
+#: g10/gpg.c:453 sm/gpgsm.c:336
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "Keine wirklichen Änderungen durchführen"
 
@@ -1636,7 +1647,7 @@ msgstr "OpenPGP-Verhalten strikt beachten"
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x-kompatibele Botschaften erzeugen"
 
-#: g10/gpg.c:553 sm/gpgsm.c:393
+#: g10/gpg.c:553 sm/gpgsm.c:397
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1645,7 +1656,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollständige Liste aller Befehle und "
 "Optionen)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:396
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1685,7 +1696,7 @@ msgstr ""
 "Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
 "Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:532
+#: g10/gpg.c:781 sm/gpgsm.c:538
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1713,7 +1724,7 @@ msgstr "Komprimierung: "
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:669
+#: g10/gpg.c:1045 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "Widersprüchliche Befehle\n"
 
@@ -1800,463 +1811,463 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "Unbekanntes Konfigurationselement `%s'\n"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr "Anzeigen der Foto-ID in den Schlüssellisten"
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr "Zeige Richtlinien-URL während der Unterschriftenlisten"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1544
 msgid "show all notations during signature listings"
 msgstr "Alle Notationen mit den Signaturen anlisten"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr "Zeige IETF-Standard"
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr "Zeige anwenderseitige Notationen in den Unterschriftenlisten"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1552
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "Der bevorzugten Schlüsselserver mit den Signaturen anlisten"
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr "Zeige Gültigkeit der User-ID in den Schlüssellisten"
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr "Zeige widerrufene und verfallene User-ID in den Schlüssellisten"
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr "Zeige widerrufene und verfallene Unterschlüssel in den Schlüssellisten"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1560
 msgid "show the keyring name in key listings"
 msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist"
 
-#: g10/gpg.c:1564
+#: g10/gpg.c:1562
 msgid "show expiration dates during signature listings"
 msgstr "Das Ablaufdatum mit den Signaturen anlisten"
 
-#: g10/gpg.c:1827
+#: g10/gpg.c:1825
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 "Die Bibliothek \"libgcrypt\" is zu alt (benötigt wird %s, vorhanden ist %s)\n"
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1981
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
 
-#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
+#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht für den üblichen Gebrauch gedacht!\n"
 
-#: g10/gpg.c:2401 g10/gpg.c:2413
+#: g10/gpg.c:2399 g10/gpg.c:2411
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' ist kein gültiges Unterschriftablaufdatum\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2493
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' ist kein gültiger Zeichensatz\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4084
+#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2528
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2531
 msgid "invalid keyserver options\n"
 msgstr "Ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2538
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ungültige Import-Option\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2541
 msgid "invalid import options\n"
 msgstr "Ungültige Import-Option\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2548
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ungültige Export-Option.\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2551
 msgid "invalid export options\n"
 msgstr "Ungültige Export-Option\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2558
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ungültige Listen-Option.\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2561
 msgid "invalid list options\n"
 msgstr "Ungültige Listen-Option\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2569
 msgid "display photo IDs during signature verification"
 msgstr "Zeige die Foto-ID während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2571
 msgid "show policy URLs during signature verification"
 msgstr "Zeige Richtlinien-URLs während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2573
 msgid "show all notations during signature verification"
 msgstr "Alle Notationen wahrend der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2575
 msgid "show IETF standard notations during signature verification"
 msgstr "Zeige IETF-Standard-Notationen während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2579
 msgid "show user-supplied notations during signature verification"
 msgstr "Zeie anwenderseitige Notationen während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2581
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "Die URL für den bevorzugten Schlüsselserver während der "
 "Unterschriftenprüfung anzeigen"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2583
 msgid "show user ID validity during signature verification"
 msgstr "Die Gültigkeit der User-ID während der Unterschriftenprüfung anzeigen"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2585
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "Zeige widerrufene und verfallene User-IDs während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2587
 msgid "show only the primary user ID in signature verification"
 msgstr "Zeige nur die Hauptuser-ID während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2589
 msgid "validate signatures with PKA data"
 msgstr "Prüfe Unterschriftengültigkeit mittels PKA-Daten"
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2591
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "werte das Vertrauen zu Unterschriften durch gültige PKA-Daten auf"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2598
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ungültige Überprüfuns-Option.\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2601
 msgid "invalid verify options\n"
 msgstr "Ungültige Überprüfungs-Option\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2608
 #, 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:2784
+#: g10/gpg.c:2782
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:2787
+#: g10/gpg.c:2785
 msgid "invalid auto-key-locate list\n"
 msgstr "ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:2873 sm/gpgsm.c:1220
+#: g10/gpg.c:2871 sm/gpgsm.c:1247
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2875
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2884
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2887
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2902
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "Startet nicht mit unsicherem Speicher, wegen Option %s\n"
 
-#: g10/gpg.c:2918
+#: g10/gpg.c:2916
 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:2924
+#: g10/gpg.c:2922
 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:2930
+#: g10/gpg.c:2928
 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:2943
+#: g10/gpg.c:2941
 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:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
+#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1303
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
+#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1311
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3025
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3040
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed müssen größer als 0 sein\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3042
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed müssen größer als 1 sein\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3044
 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:3048
+#: g10/gpg.c:3046
 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:3050
+#: g10/gpg.c:3048
 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:3053
+#: g10/gpg.c:3051
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/gpg.c:3057
+#: g10/gpg.c:3055
 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:3064
+#: g10/gpg.c:3062
 msgid "invalid default preferences\n"
 msgstr "ungültige Standard-Voreinstellungen\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3071
 msgid "invalid personal cipher preferences\n"
 msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3075
 msgid "invalid personal digest preferences\n"
 msgstr "ungültige private Hashvoreinstellungen\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3079
 msgid "invalid personal compress preferences\n"
 msgstr "ungültige private Komprimierungsvoreinstellungen\n"
 
-#: g10/gpg.c:3114
+#: g10/gpg.c:3112
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3159
 #, 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:3166
+#: g10/gpg.c:3164
 #, 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:3171
+#: g10/gpg.c:3169
 #, 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:3263
+#: g10/gpg.c:3261
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3272
 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:3295
+#: g10/gpg.c:3293
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3300
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3302
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3312
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3325
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [Dateiname]"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3327
 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:3332
+#: g10/gpg.c:3330
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Im %s-Modus kann --symmetric --encrypt nicht verwendet werden.\n"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3348
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3361
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3376
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3378
 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:3383
+#: g10/gpg.c:3381
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "Im %s-Modus kann --symmetric --sign --encrypt nicht verwendet werden.\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3401
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3410
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3435
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3443
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3447
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3468
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3553
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3557
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schlüsselexport fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3568
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3580
+#: g10/gpg.c:3578
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3631
+#: g10/gpg.c:3629
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3639
+#: g10/gpg.c:3637
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3729
+#: g10/gpg.c:3727
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ungültiges Hashverfahren '%s'\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3844
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/gpg.c:3850
+#: g10/gpg.c:3848
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4160
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4162
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4195
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
 
@@ -2268,7 +2279,7 @@ msgstr "Schlüssel aus diesem Schlüsselbund nehmen"
 msgid "make timestamp conflicts only a warning"
 msgstr "differierende Zeitangaben sind kein Fehler"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:368
+#: g10/gpgv.c:75 sm/gpgsm.c:372
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
@@ -6722,43 +6733,43 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\n"
 
-#: scd/scdaemon.c:105
+#: scd/scdaemon.c:108
 msgid "run in multi server mode (foreground)"
 msgstr "Im Multiserver Modus ausführen"
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:357
+#: scd/scdaemon.c:114 sm/gpgsm.c:361
 msgid "read options from file"
 msgstr "Konfigurationsoptionen aus Datei lesen"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:124
 msgid "|N|connect to reader at port N"
 msgstr "|N|Verbinde mit dem Leser auf Port N"
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|Benutze NAME als CT-API Treiber"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:126
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|Benutze NAME als PC/SC Treiber"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:129
 msgid "do not use the internal CCID driver"
 msgstr "Den internen CCID Treiber nicht benutzen"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:134
 msgid "do not use a reader's keypad"
 msgstr "Die Tastatur des Kartenleser nicht benutzen"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:135
 msgid "allow the use of admin card commands"
 msgstr "Erlaube die Benutzung von \"Admin\"-Befehlen"
 
-#: scd/scdaemon.c:206
+#: scd/scdaemon.c:209
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Aufruf: scdaemon [Optionen] (-h für Hilfe)"
 
-#: scd/scdaemon.c:208
+#: scd/scdaemon.c:211
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6766,18 +6777,18 @@ msgstr ""
 "Synatx: scdaemon [Optionen] [Befehl [Argumente]]\n"
 "Smartcard Daemon für GnuPG\n"
 
-#: scd/scdaemon.c:671
+#: scd/scdaemon.c:658
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 "Bitte die Option `--daemon' nutzen um das Programm im Hintergund "
 "auszuführen\n"
 
-#: scd/scdaemon.c:1019
+#: scd/scdaemon.c:1006
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "Handhabungsroutine für fd %d gestartet\n"
 
-#: scd/scdaemon.c:1024
+#: scd/scdaemon.c:1011
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "Handhabungsroutine für den fd %d beendet\n"
@@ -6807,140 +6818,256 @@ msgstr ""
 "Verbindung zum Dirmngr kann nicht aufgebaut werden - Ersatzmethode wird "
 "versucht\n"
 
-#: sm/certchain.c:174
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr ""
+
+#: sm/certchain.c:195
+msgid "chain"
+msgstr ""
+
+#: sm/certchain.c:196
+msgid "shell"
+msgstr ""
+
+#: sm/certchain.c:241
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "Die kritische Zertifikaterweiterung %s wird nicht unterstützt"
 
-#: sm/certchain.c:212
+#: sm/certchain.c:279
 msgid "issuer certificate is not marked as a CA"
 msgstr "Das Herausgeberzertifikat ist nicht für eine CA gekennzeichnet"
 
-#: sm/certchain.c:250
+#: sm/certchain.c:317
 msgid "critical marked policy without configured policies"
 msgstr "entscheidende Richtlinie ohne konfigurierte Richtlinien"
 
-#: sm/certchain.c:260
+#: sm/certchain.c:327
 #, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "Datei `%s' kann nicht geöffnet werden: %s\n"
 
-#: sm/certchain.c:267 sm/certchain.c:296
+#: sm/certchain.c:334 sm/certchain.c:363
 msgid "note: non-critical certificate policy not allowed"
 msgstr "Notiz: Die unkritische Zertifikatrichtlinie ist nicht erlaubt"
 
-#: sm/certchain.c:271 sm/certchain.c:300
+#: sm/certchain.c:338 sm/certchain.c:367
 msgid "certificate policy not allowed"
 msgstr "Die Zertifikatrichtlinie ist nicht erlaubt"
 
-#: sm/certchain.c:411
+#: sm/certchain.c:478
 msgid "looking up issuer at external location\n"
 msgstr "Der Herausgeber wird von einer externen Stelle gesucht\n"
 
-#: sm/certchain.c:431
+#: sm/certchain.c:498
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "Anzahl der übereinstimmenden Heruasgeber: %d\n"
 
-#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
 msgid "failed to allocated keyDB handle\n"
 msgstr "Ein keyDB Handle konnte nicht bereitgestellt werden\n"
 
-#: sm/certchain.c:675
+#: sm/certchain.c:742
 msgid "certificate has been revoked"
 msgstr "Das Zertifikat wurde widerrufen"
 
-#: sm/certchain.c:684
+#: sm/certchain.c:752
 msgid "no CRL found for certificate"
 msgstr "Keine CRL für das Zertifikat gefunden"
 
-#: sm/certchain.c:688
+#: sm/certchain.c:757
+msgid "the status of the certificate is unknown"
+msgstr ""
+
+#: sm/certchain.c:762
 msgid "the available CRL is too old"
 msgstr "Die vorhandene CRL ist zu alt"
 
-#: sm/certchain.c:690
+#: sm/certchain.c:764
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 "Bitte vergewissern Sie sich das der \"dirmngr\" richtig installierrt ist\n"
 
-#: sm/certchain.c:695
+#: sm/certchain.c:770
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "Die CRL konnte nicht geprüft werden: %s"
 
-#: sm/certchain.c:791
-msgid "no issuer found in certificate"
-msgstr "Im Zertifikat ist kein Herausgeber enthalten"
-
-#: sm/certchain.c:820
+#: sm/certchain.c:799 sm/certchain.c:867
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "Zertifikat mit unzulässiger Gültigkeit: %s"
 
-#: sm/certchain.c:836
+#: sm/certchain.c:814 sm/certchain.c:899
 msgid "certificate not yet valid"
 msgstr "Das Zertifikat ist noch nicht gültig"
 
-#: sm/certchain.c:849
+#: sm/certchain.c:815 sm/certchain.c:900
+#, fuzzy
+msgid "root certificate not yet valid"
+msgstr "Das Zertifikat ist noch nicht gültig"
+
+#: sm/certchain.c:816 sm/certchain.c:901
+#, fuzzy
+msgid "intermediate certificate not yet valid"
+msgstr "Das Zertifikat ist noch nicht gültig"
+
+#: sm/certchain.c:829
 msgid "certificate has expired"
 msgstr "Das Zertifikat ist abgelaufen"
 
-#: sm/certchain.c:892
-msgid "self-signed certificate has a BAD signature"
-msgstr "Das eigenbeglaubigte Zertifikat hat eine FALSCHE Signatur"
+#: sm/certchain.c:830
+#, fuzzy
+msgid "root certificate has expired"
+msgstr "Das Zertifikat ist abgelaufen"
 
-#: sm/certchain.c:960
-msgid "root certificate is not marked trusted"
-msgstr "Das Wurzelzertifikat ist nicht als vertrauenswürdig markiert"
+#: sm/certchain.c:831
+#, fuzzy
+msgid "intermediate certificate has expired"
+msgstr "Das Zertifikat ist abgelaufen"
+
+#: sm/certchain.c:873
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
+msgstr ""
+
+#: sm/certchain.c:882
+#, fuzzy
+msgid "certificate with invalid validity"
+msgstr "Zertifikat mit unzulässiger Gültigkeit: %s"
+
+#: sm/certchain.c:919
+#, fuzzy
+msgid "signature not created during lifetime of certificate"
+msgstr "Fehler beim Lesen der Liste vertrauenswürdiger root-Zertifikate\n"
+
+#: sm/certchain.c:921
+msgid "certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:922
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr ""
 
-#: sm/certchain.c:975
+#: sm/certchain.c:926
+#, fuzzy
+msgid "  (  signature created at "
+msgstr "    Signaturen bereinigt: %lu\n"
+
+#: sm/certchain.c:927
+#, fuzzy
+msgid "  (certificate created at "
+msgstr "Widerrufzertifikat erzeugt.\n"
+
+#: sm/certchain.c:930
+#, fuzzy
+msgid "  (certificate valid from "
+msgstr "Das Zertifikat ist noch nicht gültig"
+
+#: sm/certchain.c:931
+#, fuzzy
+msgid "  (     issuer valid from "
+msgstr "      Kartenseriennr. ="
+
+#: sm/certchain.c:961
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "Fingerprint=%s\n"
 
-#: sm/certchain.c:983
+#: sm/certchain.c:970
 msgid "root certificate has now been marked as trusted\n"
 msgstr "Das Wurzelzertifikat wurde nun als vertrauenswürdig markiert\n"
 
-#: sm/certchain.c:998
+#: sm/certchain.c:983
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 "Interaktives vertrauenswürdig-Markieren ist in gpg-agent ausgeschaltet\n"
 
-#: sm/certchain.c:1004
+#: sm/certchain.c:989
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 "Interaktives vertrauenswürdig-Markieren ist in dieser Sitzung ausgeschaltet\n"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1046
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr ""
+
+#: sm/certchain.c:1110
+msgid "no issuer found in certificate"
+msgstr "Im Zertifikat ist kein Herausgeber enthalten"
+
+#: sm/certchain.c:1184
+msgid "self-signed certificate has a BAD signature"
+msgstr "Das eigenbeglaubigte Zertifikat hat eine FALSCHE Signatur"
+
+#: sm/certchain.c:1253
+msgid "root certificate is not marked trusted"
+msgstr "Das Wurzelzertifikat ist nicht als vertrauenswürdig markiert"
+
+#: sm/certchain.c:1266
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Fehler beim Prüfen der vertrauenswürdigen Zertifikate: %s\n"
 
-#: sm/certchain.c:1041 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr "Der Zertifikatkette ist zu lang\n"
 
-#: sm/certchain.c:1053
+#: sm/certchain.c:1307
 msgid "issuer certificate not found"
 msgstr "Herausgeberzertifikat nicht gefunden"
 
-#: sm/certchain.c:1086
+#: sm/certchain.c:1340
 msgid "certificate has a BAD signature"
 msgstr "Das Zertifikat hat eine FALSCHE Signatur"
 
-#: sm/certchain.c:1116
+#: sm/certchain.c:1371
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 "Eine anderes möglicherweise passendes CA-Zertifikat gefunden - versuche "
 "nochmal"
 
-#: sm/certchain.c:1167
+#: sm/certchain.c:1422
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "Die Zertifikatkette ist länger als von der CA erlaubt (%d)"
 
+#: sm/certchain.c:1462 sm/certchain.c:1730
+#, fuzzy
+msgid "certificate is good\n"
+msgstr "Der Zertifikatkette ist zu lang\n"
+
+#: sm/certchain.c:1463
+#, fuzzy
+msgid "intermediate certificate is good\n"
+msgstr "Doppeltes Zertifikat `%s' gelöscht\n"
+
+#: sm/certchain.c:1464
+#, fuzzy
+msgid "root certificate is good\n"
+msgstr "Das Wurzelzertifikat ist nicht als vertrauenswürdig markiert"
+
+#: sm/certchain.c:1620
+msgid "switching to chain model"
+msgstr ""
+
+#: sm/certchain.c:1629
+#, c-format
+msgid "validation model used: %s"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "chain model"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "shell model"
+msgstr ""
+
 #: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
@@ -6981,11 +7108,11 @@ msgid "[Error - invalid DN]"
 msgstr "[Fehler - Ungültiger DN]"
 
 #: sm/certdump.c:936
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
 "\"%s\"\n"
-"S/N %s, ID %08lX, created %s"
+"S/N %s, ID 0x%08lX, created %s"
 msgstr ""
 "Bitte geben Sie die Passphrase an, um den \n"
 "geheimen Schlüssel von\n"
@@ -6998,7 +7125,7 @@ msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 "Schlüsselverwendungszweck nicht vorhanden - für alle Zwecke akzeptiert\n"
 
-#: sm/certlist.c:131 sm/keylist.c:255
+#: sm/certlist.c:131 sm/keylist.c:258
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "Fehler beim Holen der Schlüsselbenutzungsinformationen: %s\n"
@@ -7121,173 +7248,173 @@ msgstr "Fehler beim Erstellen einer temporären Datei: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "Fehler beim Schreiben auf eine temporäre Datei: %s\n"
 
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:244
 msgid "|[FILE]|make a signature"
 msgstr "|[DATEI]|Erzeuge eine Signatur"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:245
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[DATEI]|Erzeuge eine Klartextsignatur"
 
-#: sm/gpgsm.c:251
+#: sm/gpgsm.c:253
 msgid "list external keys"
 msgstr "Externe Schlüssel anzeigen"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 msgid "list certificate chain"
 msgstr "Schlüssel mit Zertifikatekette anzeigen"
 
-#: sm/gpgsm.c:256
+#: sm/gpgsm.c:258
 msgid "remove key from the public keyring"
 msgstr "Schlüssel aus dem öffentlichen Schlüsselbund löschen"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:261
 msgid "import certificates"
 msgstr "Zertifikate importieren"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:262
 msgid "export certificates"
 msgstr "Zertifikate exportieren"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 msgid "register a smartcard"
 msgstr "Smartcard registrieren"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "pass a command to the dirmngr"
 msgstr "Das Kommand an den Dirmngr durchreichen"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "invoke gpg-protect-tool"
 msgstr "Rufe das gpg-protect-tool auf"
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:268
 msgid "change a passphrase"
 msgstr "Die Passphrase ändern"
 
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
 msgid "create base-64 encoded output"
 msgstr "Ausgabe im Basis-64 format erzeugen"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:287
 msgid "assume input is in PEM format"
 msgstr "Eingabedaten sind im PEM Format"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in base-64 format"
 msgstr "Eingabedaten sind im Basis-64 Format"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in binary format"
 msgstr "Eingabedaten sind im Binärformat"
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:296
 msgid "use system's dirmngr if available"
 msgstr "Benutze den System Dirmngr when verfügbar"
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "never consult a CRL"
 msgstr "Niemals eine CRL konsultieren"
 
-#: sm/gpgsm.c:302
+#: sm/gpgsm.c:304
 msgid "check validity using OCSP"
 msgstr "Die Gültigkeit mittels OCSP prüfen"
 
-#: sm/gpgsm.c:305
+#: sm/gpgsm.c:309
 msgid "|N|number of certificates to include"
 msgstr "|N|Sende N Zertifikate mit"
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:312
 msgid "|FILE|take policy information from FILE"
 msgstr "|DATEI|Richtlinieninformationen DATEI entnehmen"
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:315
 msgid "do not check certificate policies"
 msgstr "Zertikikatrichtlinien nicht überprüfen"
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:319
 msgid "fetch missing issuer certificates"
 msgstr "Fehlende Zertifikate automatisch holen"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:323
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|NAME als voreingestellten Empfänger benutzen"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:325
 msgid "use the default key as default recipient"
 msgstr ""
 "Den Standardschlüssel als voreingestellten\n"
 "Empfänger benutzen"
 
-#: sm/gpgsm.c:338
+#: sm/gpgsm.c:342
 msgid "don't use the terminal at all"
 msgstr "das Terminal gar nicht benutzen"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:346
 msgid "force v3 signatures"
 msgstr "v3 Signaturen erzwingen"
 
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:347
 msgid "always use a MDC for encryption"
 msgstr "Beim Verschlüsseln ein Siegel (MDC) verwenden"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:352
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:353
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:354
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:356
 msgid "add this keyring to the list of keyrings"
 msgstr "Als öffentlichen Schlüsselbund mitbenutzen"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:357
 msgid "add this secret keyring to the list"
 msgstr "Als geheimen Schlüsselbund mitbenutzen"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:359
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|Schlüssel bei diesem Server nachschlagen"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:360
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|Terminalzeichensatz NAME benutzen"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:364
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NAME|Die Debugstufe auf NAME setzen"
 
-#: sm/gpgsm.c:375
+#: sm/gpgsm.c:379
 msgid "|FILE|load extension module FILE"
 msgstr "|DATEI|Erweiterungsmodul DATEI laden"
 
-#: sm/gpgsm.c:381
+#: sm/gpgsm.c:385
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Verschl.verfahren NAME benutzen"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:387
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:389
 msgid "|N|use compress algorithm N"
 msgstr "|N|Komprimierverfahren N benutzen"
 
-#: sm/gpgsm.c:522
+#: sm/gpgsm.c:528
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Aufruf: gpgsm [Optionen] [Dateien] (-h für Hilfe)"
 
-#: sm/gpgsm.c:525
+#: sm/gpgsm.c:531
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7296,30 +7423,35 @@ msgstr ""
 "Syntax: gpgsm [Optionen] [Dateien]\n"
 "Signieren, prüfen, ver- und entschlüsseln mittels S/MIME protocol\n"
 
-#: sm/gpgsm.c:604
+#: sm/gpgsm.c:610
 msgid "usage: gpgsm [options] "
 msgstr "Aufruf: gpgsm [Optionen] "
 
-#: sm/gpgsm.c:685
+#: sm/gpgsm.c:691
 #, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "Verschlüsseln für `%s' nicht möglich: %s\n"
 
-#: sm/gpgsm.c:1237
+#: sm/gpgsm.c:713
+#, fuzzy, c-format
+msgid "unknown validation model `%s'\n"
+msgstr "Unbekannte Option '%s'\n"
+
+#: sm/gpgsm.c:1264
 msgid "WARNING: running with faked system time: "
 msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
 
-#: sm/gpgsm.c:1316
+#: sm/gpgsm.c:1344
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "Importiere allgemeine Zertifikate: %s\n"
 
-#: sm/gpgsm.c:1334
+#: sm/gpgsm.c:1362
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "Signieren mit `%s' nicht möglich: %s\n"
 
-#: sm/gpgsm.c:1529
+#: sm/gpgsm.c:1543
 msgid "this command has not yet been implemented\n"
 msgstr "Dieser Befehl wurde noch nicht implementiert\n"
 
@@ -7341,7 +7473,7 @@ msgstr "Grundlegende Zertifikatprüfungen fehlgeschlagen - nicht importiert\n"
 msgid "error importing certificate: %s\n"
 msgstr "Fehler beim Importieren des Zertifikats: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:375
+#: sm/import.c:541 tools/gpg-connect-agent.c:374
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "Fehler beim Lesen der Eingabe: %s\n"
@@ -7431,7 +7563,7 @@ msgstr ""
 "\n"
 "%s%sSind Sie wirklich sicher, daß Sie dies möchten?"
 
-#: sm/qualified.c:234
+#: sm/qualified.c:234 sm/verify.c:536
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7456,27 +7588,32 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Prüfung auf ein qualifiziertes Zertifikats fehlgeschlagen: %s\n"
 
-#: sm/verify.c:386
+#: sm/verify.c:388
 msgid "Signature made "
 msgstr "Signatur erzeugt am "
 
-#: sm/verify.c:390
+#: sm/verify.c:392
 msgid "[date not given]"
 msgstr "[Datum nicht vorhanden]"
 
-#: sm/verify.c:391
-#, c-format
-msgid " using certificate ID %08lX\n"
+#: sm/verify.c:393
+#, fuzzy, c-format
+msgid " using certificate ID 0x%08lX\n"
 msgstr "mittels Zertifikat ID %08lX\n"
 
-#: sm/verify.c:507
+#: sm/verify.c:514
 msgid "Good signature from"
 msgstr "Korrekte Signatur von"
 
-#: sm/verify.c:508
+#: sm/verify.c:515
 msgid "                aka"
 msgstr "                alias"
 
+#: sm/verify.c:533
+#, fuzzy
+msgid "This is a qualified signature\n"
+msgstr "Dies wird eine Eigenbeglaubigung sein.\n"
+
 #: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 msgid "quiet"
 msgstr "Weniger Ausgaben"
@@ -7513,130 +7650,135 @@ msgstr ""
 "Syntax: gpg-connect-agent [Optionen]\n"
 "Mit einem laufenden Agenten verbinden und Befehle senden\n"
 
-#: tools/gpg-connect-agent.c:315
+#: tools/gpg-connect-agent.c:314
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "Option \"%s\" erfordert ein Programm und evtl. Argumente\n"
 
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:323
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "Optuin \"%s\" wird wegen \"%s\" nicht beachtet\n"
 
-#: tools/gpg-connect-agent.c:382
+#: tools/gpg-connect-agent.c:381
 msgid "line too long - skipped\n"
 msgstr "Zeile zu lang - übersprungen\n"
 
-#: tools/gpg-connect-agent.c:386
+#: tools/gpg-connect-agent.c:385
 msgid "line shortened due to embedded Nul character\n"
 msgstr "Zeile wegen enthaltenem Nul-Zeichen gekürzt\n"
 
-#: tools/gpg-connect-agent.c:458
+#: tools/gpg-connect-agent.c:457
 #, c-format
 msgid "unknown command `%s'\n"
 msgstr "unbekannter Befehl `%s'\n"
 
-#: tools/gpg-connect-agent.c:466
+#: tools/gpg-connect-agent.c:465
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "Senden der Zeile schlug fehl: %s\n"
 
-#: tools/gpg-connect-agent.c:474
+#: tools/gpg-connect-agent.c:473
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "Empfangen der Zeile schlug fehl: %s\n"
 
-#: tools/gpg-connect-agent.c:784
+#: tools/gpg-connect-agent.c:789
 #, c-format
 msgid "error sending %s command: %s\n"
 msgstr "Fehler beim Senden des %s-Befehls: %s\n"
 
-#: tools/gpg-connect-agent.c:793
+#: tools/gpg-connect-agent.c:798
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "Fehler beim Senden der Standardoptionen: %s\n"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
 msgid "Options controlling the diagnostic output"
 msgstr "Optionen zur Einstellung Diagnoseausgaben"
 
-#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
+#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
 msgid "Options controlling the configuration"
 msgstr "Optionen zur Einstellung der Konfiguration"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
-#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
+#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
 msgid "Options useful for debugging"
 msgstr "Nützliche Optionen zum Debuggen"
 
-#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
-#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
 
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
 msgid "Options controlling the security"
 msgstr "Optionen zur Einstellung der Sicherheit"
 
-#: tools/gpgconf-comp.c:501
+#: tools/gpgconf-comp.c:492
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|lasse SSH Schlüssel im Cache nach N Sekunden verfallen"
 
-#: tools/gpgconf-comp.c:505
+#: tools/gpgconf-comp.c:496
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|setze die maximale Lebensdauer von PINs im Cache auf N Sekunden"
 
-#: tools/gpgconf-comp.c:509
+#: tools/gpgconf-comp.c:500
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|setze die maximale Lebenszeit von SSH Schlüsseln auf N Sekunden"
 
-#: tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:510
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|setze die kleinste erlaubte Länge von Passphrasen auf N"
 
-#: tools/gpgconf-comp.c:638
+#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#, fuzzy
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAME|Verschlüsseln für NAME"
+
+#: tools/gpgconf-comp.c:635
 msgid "Configuration for Keyservers"
 msgstr "Konfiguration der Schlüsselserver"
 
-#: tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:640
 msgid "allow PKA lookups (DNS requests)"
 msgstr "Erlaube PKA Zugriffe (DNS Anfragen)"
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:685
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|Benutze die Kodierung NAME für PKCS#12 Passphrasen"
 
-#: tools/gpgconf-comp.c:705
+#: tools/gpgconf-comp.c:708
 msgid "do not check CRLs for root certificates"
 msgstr "CRL bei Wurzelzertifikaten nicht überprüfen"
 
-#: tools/gpgconf-comp.c:749
+#: tools/gpgconf-comp.c:752
 msgid "Options controlling the format of the output"
 msgstr "Optionen zum Einstellen der Ausgabeformate"
 
-#: tools/gpgconf-comp.c:785
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the interactivity and enforcement"
 msgstr "Optionen zur Einstellung der Interaktivität und Geltendmachung"
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
 msgid "Configuration for HTTP servers"
 msgstr "Konfiguration für HTTP Server"
 
-#: tools/gpgconf-comp.c:806
+#: tools/gpgconf-comp.c:809
 msgid "use system's HTTP proxy setting"
 msgstr "Einstellungen des System HTTP-Proxy benutzen"
 
-#: tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:814
 msgid "Configuration of LDAP servers to use"
 msgstr "Konfiguration der zu nutzenden LDAP-Server"
 
-#: tools/gpgconf-comp.c:848
+#: tools/gpgconf-comp.c:851
 msgid "Configuration for OCSP"
 msgstr "Konfiguration zu OCSP"
 
-#: tools/gpgconf-comp.c:2681
+#: tools/gpgconf-comp.c:2684
 msgid "Note that group specifications are ignored\n"
 msgstr "Beachten Sie, daß Gruppenspezifiaktionen ignoriert werden\n"
 
diff --git a/po/el.po b/po/el.po
index 1a344cf74..1f371a7cb 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-07-05 18:01+0200\n"
+"POT-Creation-Date: 2007-08-10 15:49+0200\n"
 "PO-Revision-Date: 2003-06-27 12:00+0200\n"
 "Last-Translator: Dokianakis Theofanis <madf@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -19,54 +19,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: agent/call-pinentry.c:426
+#: agent/call-pinentry.c:436
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:429
+#: agent/call-pinentry.c:439
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/call-pinentry.c:476
+#: agent/call-pinentry.c:486
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
+#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
 #, fuzzy
 msgid "PIN too long"
 msgstr "� ������ ����� ���� ������\n"
 
-#: agent/call-pinentry.c:497
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "� ����� ������ ����� ���� ������\n"
 
-#: agent/call-pinentry.c:505
+#: agent/call-pinentry.c:515
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "�� ������� ���������� ��� �����\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:520
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:522
+#: agent/call-pinentry.c:532
 #, fuzzy
 msgid "Bad PIN"
 msgstr "���� MPI"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:533
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "���� ����� ������"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:569
 #, fuzzy
 msgid "Passphrase"
 msgstr "���� ����� ������"
@@ -83,14 +83,14 @@ msgstr "��� ������������� � ���������� ���������� %d%s\n"
 msgid "can't create `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
 #: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
-#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1796
+#: sm/gpgsm.c:1833 sm/gpgsm.c:1871 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
@@ -177,35 +177,46 @@ msgstr[1] ""
 msgid "Take this one anyway"
 msgstr "����� ���������� ����� ��� ��������; "
 
-#: agent/genkey.c:99
+#: agent/genkey.c:99 agent/genkey.c:114
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "�������������� �� ����� ������\n"
 
-#: agent/genkey.c:144
+#: agent/genkey.c:107
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+
+#: agent/genkey.c:113
+msgid "Yes, protection is not needed"
+msgstr ""
+
+#: agent/genkey.c:158
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
 "\n"
 
-#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
+#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "������ ��� ������ ������"
 
-#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
 #: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:263
+#: agent/genkey.c:280
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "������ ��� ������ ������"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -215,248 +226,248 @@ msgstr ""
 "��������:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:103
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
-#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
 #: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "���������"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
-#: sm/gpgsm.c:337
+#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "����� ������"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:109
+#: agent/gpg-agent.c:118 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|������|������� ��� ���������� ��������� ������"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:119
+#: agent/gpg-agent.c:125 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:125
+#: agent/gpg-agent.c:126
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "��������� �������� �� ��� ���������� ��������"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:129
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "�������� ��� ����� ��������� ������������"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:145
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:206 sm/gpgsm.c:525 tools/gpg-connect-agent.c:124
 #: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "��������� �� ���������� ��� <gnupg-bugs@gnu.org>\n"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:262
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
+#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
-#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:340 sm/gpgsm.c:772 sm/gpgsm.c:775 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
+#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:863
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
-#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
-#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: scd/scdaemon.c:421 sm/gpgsm.c:867 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
+#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:874
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "������ ���� �� ���������� ��� `%s': %s\n"
 
-#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
-#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:921
+#: agent/gpg-agent.c:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
+#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:908
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�������� ����������� ��������� `%s': %s\n"
 
-#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
+#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
+#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "������ ��� �������� ���� �� `%s': %s\n"
 
-#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
+#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
+#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: ��������� �������������\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1377
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read ������� (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1381
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: �������� ����������� ���������: %s\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1497
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1519
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
+#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "� ��������� �������� �������: %s\n"
 
-#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
+#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ������������: %s\n"
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1752
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:751
+#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "��������������� ��������� ������������� GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
-#: tools/gpg-connect-agent.c:762
+#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
@@ -521,42 +532,42 @@ msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 msgid "cancelled\n"
 msgstr "�������"
 
-#: agent/trustlist.c:131 agent/trustlist.c:319
+#: agent/trustlist.c:132 agent/trustlist.c:322
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: agent/trustlist.c:146
+#: agent/trustlist.c:147
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: agent/trustlist.c:166 agent/trustlist.c:174
+#: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:180
+#: agent/trustlist.c:181
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "������� ��� �������� �������� ��� ����� ���������\n"
 
-#: agent/trustlist.c:215
+#: agent/trustlist.c:216
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "������ ���������: %s\n"
 
-#: agent/trustlist.c:241 agent/trustlist.c:248
+#: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:280
+#: agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: agent/trustlist.c:381 agent/trustlist.c:420
+#: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -569,7 +580,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:496
+#: agent/trustlist.c:507
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -579,7 +590,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:505
+#: agent/trustlist.c:516
 msgid "Correct"
 msgstr ""
 
@@ -591,58 +602,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:525
+#: agent/trustlist.c:536
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 #, fuzzy
 msgid "Yes"
 msgstr "���|���"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:393
+#: common/exechelp.c:302 common/exechelp.c:390
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: common/exechelp.c:369 common/exechelp.c:426
+#: common/exechelp.c:366 common/exechelp.c:423
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "�������� ��������� ��� �������: %s\n"
 
-#: common/exechelp.c:405 common/exechelp.c:635
+#: common/exechelp.c:402 common/exechelp.c:632
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: common/exechelp.c:461 common/exechelp.c:504
+#: common/exechelp.c:458 common/exechelp.c:501
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:469
+#: common/exechelp.c:466
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: common/exechelp.c:475 common/exechelp.c:515
+#: common/exechelp.c:472 common/exechelp.c:512
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: common/exechelp.c:510
+#: common/exechelp.c:507
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:521
+#: common/exechelp.c:518
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
@@ -661,26 +672,26 @@ msgstr "[User id ��� �������]"
 msgid "gpg-agent is not available in this session\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: common/simple-pwquery.c:376
+#: common/simple-pwquery.c:373
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
 
-#: common/simple-pwquery.c:387
+#: common/simple-pwquery.c:384
 msgid "communication problem with gpg-agent\n"
 msgstr "�������� ������������ �� �� gpg-agent\n"
 
-#: common/simple-pwquery.c:397
+#: common/simple-pwquery.c:394
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
 
-#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+#: common/simple-pwquery.c:557 common/simple-pwquery.c:653
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "��������� ��� �� ������\n"
 
-#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+#: common/simple-pwquery.c:572 common/simple-pwquery.c:659
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
@@ -862,7 +873,7 @@ msgstr "�������������: �������� �� ������ �������� ���������\n"
 msgid "not human readable"
 msgstr "�� ����������"
 
-#: g10/card-util.c:62 g10/card-util.c:305
+#: g10/card-util.c:62 g10/card-util.c:308
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "�� ������� ������ ��� ����� ���������"
@@ -872,166 +883,166 @@ msgstr "�� ������� ������ ��� ����� ���������"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1391 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
 #: g10/keygen.c:1644
 msgid "Your selection? "
 msgstr "� ������� ���; "
 
-#: g10/card-util.c:215 g10/card-util.c:265
+#: g10/card-util.c:218 g10/card-util.c:268
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:412
+#: g10/card-util.c:415
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 #, fuzzy
 msgid "unspecified"
 msgstr "��� ���� ������� �����"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 #, fuzzy
 msgid "not forced"
 msgstr "�� �������������"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:521
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:523
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:525
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:539
+#: g10/card-util.c:542
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:544
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:562
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:580
+#: g10/card-util.c:583
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "������ ��������� ������� ������: %s\n"
 
-#: g10/card-util.c:588
+#: g10/card-util.c:591
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
+#: g10/card-util.c:689 g10/card-util.c:758 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: g10/card-util.c:694
+#: g10/card-util.c:697
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:704
+#: g10/card-util.c:707
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:763
+#: g10/card-util.c:766
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:773
+#: g10/card-util.c:776
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:793
+#: g10/card-util.c:796
 #, fuzzy
 msgid "Language preferences: "
 msgstr "����������� ��������"
 
-#: g10/card-util.c:801
+#: g10/card-util.c:804
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:813
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/card-util.c:831
+#: g10/card-util.c:834
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:845
+#: g10/card-util.c:848
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "������: �� ������ ���������\n"
 
-#: g10/card-util.c:866
+#: g10/card-util.c:869
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "���������� ��� fingerprint"
 
-#: g10/card-util.c:889
+#: g10/card-util.c:892
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "������: �� ������ ���������\n"
 
-#: g10/card-util.c:937
+#: g10/card-util.c:940
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:941
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: g10/card-util.c:947
+#: g10/card-util.c:950
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/card-util.c:1031
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1051 g10/card-util.c:1060
+#: g10/card-util.c:1054 g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1075
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1084
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1039,136 +1050,136 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1115
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
 
-#: g10/card-util.c:1117 g10/card-util.c:1194
+#: g10/card-util.c:1120 g10/card-util.c:1197
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/card-util.c:1118 g10/card-util.c:1196
+#: g10/card-util.c:1121 g10/card-util.c:1199
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1198
+#: g10/card-util.c:1122 g10/card-util.c:1201
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1135 g10/card-util.c:1214 g10/keyedit.c:945
+#: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
 #: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "�� ������ �������.\n"
 
-#: g10/card-util.c:1191
+#: g10/card-util.c:1194
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
 
-#: g10/card-util.c:1226
+#: g10/card-util.c:1229
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "�������� ���������� ����������\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1234
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1239
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/card-util.c:1304 g10/keyedit.c:1362
+#: g10/card-util.c:1307 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "����������� ����� ��� �����"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1309
 #, fuzzy
 msgid "show admin commands"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1307 g10/keyedit.c:1365
+#: g10/card-util.c:1310 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "���������� ����� ��� ��������"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1312
 #, fuzzy
 msgid "list all available data"
 msgstr "������ ��������� ���: "
 
-#: g10/card-util.c:1312
+#: g10/card-util.c:1315
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1313
+#: g10/card-util.c:1316
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1317
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1315
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "change the login name"
 msgstr "������ ��� ����������� �����"
 
-#: g10/card-util.c:1316
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "change the language preferences"
 msgstr "������ ��� ������������ ���������"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1320
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "���������� ��� fingerprint"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1322
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1323
 #, fuzzy
 msgid "generate new keys"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1324
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1325
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442 g10/keyedit.c:1634
+#: g10/card-util.c:1445 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "������> "
 
-#: g10/card-util.c:1480
+#: g10/card-util.c:1483
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1511
+#: g10/card-util.c:1514
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1513
+#: g10/card-util.c:1516
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/card-util.c:1587 g10/keyedit.c:2255
+#: g10/card-util.c:1590 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�� ������ ������  (��������� \"help\")\n"
 
@@ -1176,7 +1187,7 @@ msgstr "�� ������ ������  (��������� \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ��� ���������� ��� ���� ��� ������\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "�������� ��������� ��� `%s'\n"
@@ -1493,7 +1504,7 @@ msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1509,27 +1520,27 @@ msgstr "|[������]|���������� ���� ���������"
 msgid "|[file]|make a clear text signature"
 msgstr "|[������]|���������� ���� �� ���������������� ���������"
 
-#: g10/gpg.c:372 sm/gpgsm.c:244
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "���������� ���� �� ������������� ���������"
 
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "������������� ���������"
 
-#: g10/gpg.c:375 sm/gpgsm.c:246
+#: g10/gpg.c:375 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "������������� �� ����� ���� ����������� ����������"
 
-#: g10/gpg.c:377 sm/gpgsm.c:247
+#: g10/gpg.c:377 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "���������������� ��������� (��������������)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:248
+#: g10/gpg.c:379 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "���������� ���� ���������"
 
-#: g10/gpg.c:381 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "���������� ��� ������ ��������"
 
@@ -1542,11 +1553,11 @@ msgstr "���������� ��� ������ �������� ��� ���������"
 msgid "list and check key signatures"
 msgstr "������� ��������� ��������"
 
-#: g10/gpg.c:385 sm/gpgsm.c:254
+#: g10/gpg.c:385 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "���������� ��� ������ �������� ��� ������������ (fingerprints)"
 
-#: g10/gpg.c:386 sm/gpgsm.c:252
+#: g10/gpg.c:386 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "���������� ��� ������ �������� ��������"
 
@@ -1582,11 +1593,11 @@ msgstr "���������� ���� �������������� ���������"
 msgid "export keys"
 msgstr "������� ��������"
 
-#: g10/gpg.c:397 sm/gpgsm.c:257
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "������� �������� �� ��� ���������� ��������"
 
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "�������� �������� ��� ��� ���������� ��������"
 
@@ -1622,11 +1633,11 @@ msgstr "�������� ��� ����� ��������� ������������"
 msgid "|algo [files]|print message digests"
 msgstr "|����� [������]| ���������� ���������� ��� ���������"
 
-#: g10/gpg.c:430 sm/gpgsm.c:262
+#: g10/gpg.c:430 sm/gpgsm.c:264
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
 #: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1637,31 +1648,31 @@ msgstr ""
 "��������:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:279
+#: g10/gpg.c:434 sm/gpgsm.c:281
 msgid "create ascii armored output"
 msgstr "���������� ascii ������������ ������"
 
-#: g10/gpg.c:436 sm/gpgsm.c:291
+#: g10/gpg.c:436 sm/gpgsm.c:293
 msgid "|NAME|encrypt for NAME"
 msgstr "|�����|������������� ��� �����"
 
-#: g10/gpg.c:447 sm/gpgsm.c:327
+#: g10/gpg.c:447 sm/gpgsm.c:331
 msgid "use this user-id to sign or decrypt"
 msgstr "����� ����� ��� ���������� (user id) ��� �������� � ����������������"
 
-#: g10/gpg.c:448 sm/gpgsm.c:330
+#: g10/gpg.c:448 sm/gpgsm.c:334
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|���������� �������� ��������� N (0 �������������)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:332
+#: g10/gpg.c:453 sm/gpgsm.c:336
 msgid "use canonical text mode"
 msgstr "����� ��������� ���������� ��������"
 
-#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "����� �� ������� ������"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "�� �� ����� ������ ������"
 
@@ -1677,7 +1688,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:393
+#: g10/gpg.c:553 sm/gpgsm.c:397
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1685,7 +1696,7 @@ msgstr ""
 "@\n"
 "(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:396
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1723,7 +1734,7 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:532
+#: g10/gpg.c:781 sm/gpgsm.c:538
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1751,7 +1762,7 @@ msgstr "��������: "
 msgid "usage: gpg [options] "
 msgstr "�����: gpg [��������] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:669
+#: g10/gpg.c:1045 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "������������� �������\n"
 
@@ -1830,469 +1841,469 @@ msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "������� ����������� ��������� \"%s\"\n"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1552
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1560
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "���������� ��� ����������� ���� ����� ��������� �� ������"
 
-#: g10/gpg.c:1564
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1827
+#: g10/gpg.c:1825
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1981
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
 
-#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
+#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
 
-#: g10/gpg.c:2401 g10/gpg.c:2413
+#: g10/gpg.c:2399 g10/gpg.c:2411
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2493
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4084
+#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2528
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2531
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2538
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2541
 msgid "invalid import options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2548
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2551
 msgid "invalid export options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2558
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2561
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2569
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2571
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2573
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2575
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2579
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2581
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2585
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2587
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2589
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2591
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2598
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2608
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�������� ������� ��� exec-path �� %s\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2782
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2787
+#: g10/gpg.c:2785
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2873 sm/gpgsm.c:1220
+#: g10/gpg.c:2871 sm/gpgsm.c:1247
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2875
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�������������: �� %s ����������� �� %s\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2884
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2887
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2902
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/gpg.c:2918
+#: g10/gpg.c:2916
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2922
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
 "���������\n"
 
-#: g10/gpg.c:2930
+#: g10/gpg.c:2928
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
 
-#: g10/gpg.c:2943
+#: g10/gpg.c:2941
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
 
-#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
+#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1303
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
+#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1311
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3025
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "� ����������� ���������� ��������� ��� �����������\n"
 "��� ����� �������\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3040
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3042
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3044
 #, 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:3048
+#: g10/gpg.c:3046
 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:3050
+#: g10/gpg.c:3048
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3053
+#: g10/gpg.c:3051
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
 
-#: g10/gpg.c:3057
+#: g10/gpg.c:3055
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3062
 msgid "invalid default preferences\n"
 msgstr "�� ������� �����������\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3071
 msgid "invalid personal cipher preferences\n"
 msgstr "�� ������� ����������� ���������� ���������������\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3075
 msgid "invalid personal digest preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3079
 msgid "invalid personal compress preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3114
+#: g10/gpg.c:3112
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3159
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3164
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3171
+#: g10/gpg.c:3169
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3263
+#: g10/gpg.c:3261
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3272
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "�������������: ������� ���������� (-r) ����� ����� ��������������\n"
 "�������� ��������\n"
 
-#: g10/gpg.c:3295
+#: g10/gpg.c:3293
 msgid "--store [filename]"
 msgstr "--store [����� �������]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3300
 msgid "--symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3302
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3312
 msgid "--encrypt [filename]"
 msgstr "--encrypt [����� �������]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3325
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3327
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3332
+#: g10/gpg.c:3330
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3348
 msgid "--sign [filename]"
 msgstr "--sign [����� �������]"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3361
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3376
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3378
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3381
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3401
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [����� �������]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3410
 msgid "--clearsign [filename]"
 msgstr "--clearsign [����� �������]"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3435
 msgid "--decrypt [filename]"
 msgstr "--decrypt [����� �������]"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3443
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3447
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3468
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [�������]"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3553
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3557
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "������� �������� �������: %s\n"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3568
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver ��������� �������: %s\n"
 
-#: g10/gpg.c:3580
+#: g10/gpg.c:3578
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3631
+#: g10/gpg.c:3629
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: g10/gpg.c:3639
+#: g10/gpg.c:3637
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/gpg.c:3729
+#: g10/gpg.c:3727
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3844
 msgid "[filename]"
 msgstr "[����� �������]"
 
-#: g10/gpg.c:3850
+#: g10/gpg.c:3848
 msgid "Go ahead and type your message ...\n"
 msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4160
 msgid "the given certification policy URL is invalid\n"
 msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4162
 msgid "the given signature policy URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4195
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
@@ -2305,7 +2316,7 @@ msgstr "������� ��� �������� ��� ���� �� ����������"
 msgid "make timestamp conflicts only a warning"
 msgstr "������� ��� ����������� ���� (timestamp) ���� ��� �������������"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:368
+#: g10/gpgv.c:75 sm/gpgsm.c:372
 msgid "|FD|write status info to this FD"
 msgstr "|FD|������� ��� ����������� ���������� ��� FD"
 
@@ -6794,64 +6805,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: scd/scdaemon.c:105
+#: scd/scdaemon.c:108
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:357
+#: scd/scdaemon.c:114 sm/gpgsm.c:361
 #, fuzzy
 msgid "read options from file"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:124
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|�����|����� ��� �������� �� ��������������� ���������"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|�����|����� ��� �������� �� ��������������� ���������"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:129
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "�� ����� ����������"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:134
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:135
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "������������� �������\n"
 
-#: scd/scdaemon.c:206
+#: scd/scdaemon.c:209
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: scd/scdaemon.c:208
+#: scd/scdaemon.c:211
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:671
+#: scd/scdaemon.c:658
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1019
+#: scd/scdaemon.c:1006
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1024
+#: scd/scdaemon.c:1011
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6880,143 +6891,257 @@ msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:174
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr ""
+
+#: sm/certchain.c:195
+msgid "chain"
+msgstr ""
+
+#: sm/certchain.c:196
+#, fuzzy
+msgid "shell"
+msgstr "help"
+
+#: sm/certchain.c:241
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
 
-#: sm/certchain.c:212
+#: sm/certchain.c:279
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:250
+#: sm/certchain.c:317
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:260
+#: sm/certchain.c:327
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: sm/certchain.c:267 sm/certchain.c:296
+#: sm/certchain.c:334 sm/certchain.c:363
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:271 sm/certchain.c:300
+#: sm/certchain.c:338 sm/certchain.c:367
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: sm/certchain.c:411
+#: sm/certchain.c:478
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:431
+#: sm/certchain.c:498
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: sm/certchain.c:675
+#: sm/certchain.c:742
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "��������: �� ������ ���� ���������"
 
-#: sm/certchain.c:684
+#: sm/certchain.c:752
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "���� �������������"
 
-#: sm/certchain.c:688
+#: sm/certchain.c:757
+msgid "the status of the certificate is unknown"
+msgstr ""
+
+#: sm/certchain.c:762
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "������ ��������� ���: "
 
-#: sm/certchain.c:690
+#: sm/certchain.c:764
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:695
+#: sm/certchain.c:770
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 
-#: sm/certchain.c:791
-#, fuzzy
-msgid "no issuer found in certificate"
-msgstr "���������� ���� �������������� ���������"
-
-#: sm/certchain.c:820
+#: sm/certchain.c:799 sm/certchain.c:867
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:836
+#: sm/certchain.c:814 sm/certchain.c:899
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:849
+#: sm/certchain.c:815 sm/certchain.c:900
+#, fuzzy
+msgid "root certificate not yet valid"
+msgstr "������� ��� �������� �������� ��� `%s'\n"
+
+#: sm/certchain.c:816 sm/certchain.c:901
+msgid "intermediate certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:829
 #, fuzzy
 msgid "certificate has expired"
 msgstr "���� �� ������ ���� �����!"
 
-#: sm/certchain.c:892
-msgid "self-signed certificate has a BAD signature"
+#: sm/certchain.c:830
+#, fuzzy
+msgid "root certificate has expired"
+msgstr "���� �� ������ ���� �����!"
+
+#: sm/certchain.c:831
+#, fuzzy
+msgid "intermediate certificate has expired"
+msgstr "���� �� ������ ���� �����!"
+
+#: sm/certchain.c:873
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:960
-msgid "root certificate is not marked trusted"
+#: sm/certchain.c:882
+#, fuzzy
+msgid "certificate with invalid validity"
+msgstr "���� �� ������ ���� �����!"
+
+#: sm/certchain.c:919
+msgid "signature not created during lifetime of certificate"
+msgstr ""
+
+#: sm/certchain.c:921
+msgid "certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:922
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:926
+#, fuzzy
+msgid "  (  signature created at "
+msgstr "        ���� ���������: %lu\n"
+
+#: sm/certchain.c:927
+#, fuzzy
+msgid "  (certificate created at "
+msgstr "������������� ��������� �������������.\n"
+
+#: sm/certchain.c:930
+#, fuzzy
+msgid "  (certificate valid from "
+msgstr "���� �������������"
+
+#: sm/certchain.c:931
+msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:975
+#: sm/certchain.c:961
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "���������� ��� fingerprint"
 
-#: sm/certchain.c:983
+#: sm/certchain.c:970
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:998
+#: sm/certchain.c:983
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1004
+#: sm/certchain.c:989
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1046
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr ""
+
+#: sm/certchain.c:1110
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "���������� ���� �������������� ���������"
+
+#: sm/certchain.c:1184
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:1253
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:1266
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 
-#: sm/certchain.c:1041 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1053
+#: sm/certchain.c:1307
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1086
+#: sm/certchain.c:1340
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "���������� ���� ���������"
 
-#: sm/certchain.c:1116
+#: sm/certchain.c:1371
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1167
+#: sm/certchain.c:1422
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
+#: sm/certchain.c:1462 sm/certchain.c:1730
+#, fuzzy
+msgid "certificate is good\n"
+msgstr "� ���������� %c%lu ������������\n"
+
+#: sm/certchain.c:1463
+#, fuzzy
+msgid "intermediate certificate is good\n"
+msgstr "������������� ��������� �������������.\n"
+
+#: sm/certchain.c:1464
+#, fuzzy
+msgid "root certificate is good\n"
+msgstr "���� �������������"
+
+#: sm/certchain.c:1620
+msgid "switching to chain model"
+msgstr ""
+
+#: sm/certchain.c:1629
+#, c-format
+msgid "validation model used: %s"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "chain model"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "shell model"
+msgstr ""
+
 #: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
@@ -7064,7 +7189,7 @@ msgstr "������: �� ������ ���������\n"
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
 "\"%s\"\n"
-"S/N %s, ID %08lX, created %s"
+"S/N %s, ID 0x%08lX, created %s"
 msgstr ""
 "���������� ��� ����� ������ ��� �� ������������ �� ������� ������ ��� �� "
 "������:\n"
@@ -7075,7 +7200,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:131 sm/keylist.c:255
+#: sm/certlist.c:131 sm/keylist.c:258
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
@@ -7197,181 +7322,181 @@ msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "������� ���  `%s'\n"
 
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[������]|���������� ���� ���������"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[������]|���������� ���� �� ���������������� ���������"
 
-#: sm/gpgsm.c:251
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list external keys"
 msgstr "���������� ��� ������ �������� ��������"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list certificate chain"
 msgstr "���� �������������"
 
-#: sm/gpgsm.c:256
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "import certificates"
 msgstr "���� �������������"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:262
 #, fuzzy
 msgid "export certificates"
 msgstr "���� �������������"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:268
 #, fuzzy
 msgid "change a passphrase"
 msgstr "������ ��� ������ ������"
 
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "���������� ascii ������������ ������"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:287
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:296
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:302
+#: sm/gpgsm.c:304
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:305
+#: sm/gpgsm.c:309
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:312
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:315
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:319
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:323
 msgid "|NAME|use NAME as default recipient"
 msgstr "|�����|����� ��� �������� �� ��������������� ���������"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:325
 msgid "use the default key as default recipient"
 msgstr "����� ��� ��������������� �������� �� ��������������� ���������"
 
-#: sm/gpgsm.c:338
+#: sm/gpgsm.c:342
 msgid "don't use the terminal at all"
 msgstr "�� ����� ����������"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:346
 msgid "force v3 signatures"
 msgstr "������������ ������ v3 ���������"
 
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:347
 msgid "always use a MDC for encryption"
 msgstr "����� ������� MDC ��� �������������"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:352
 msgid "batch mode: never ask"
 msgstr "��������� batch: �� �� �������� ���������"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:353
 msgid "assume yes on most questions"
 msgstr "�������� ��� ���� ������������ ���������"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:354
 msgid "assume no on most questions"
 msgstr "�������� ��� ���� ������������ ���������"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:356
 msgid "add this keyring to the list of keyrings"
 msgstr "�������� ����� ��� �������� ��� ����� ��� �����������"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:357
 msgid "add this secret keyring to the list"
 msgstr "�������� ����� ��� �������� ����������� ��� �����"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
 msgid "|NAME|use NAME as default secret key"
 msgstr "|�����|����� �������� ��� �������������� ������� ������"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:359
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|�����������|����� ����� ��� ���������� �������� ��� ���������"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:360
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|�����|���������� ��� ��� ���������� ���������� �� �����"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:364
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:375
+#: sm/gpgsm.c:379
 msgid "|FILE|load extension module FILE"
 msgstr "|������|������� ��� ���������� ��������� ������"
 
-#: sm/gpgsm.c:381
+#: sm/gpgsm.c:385
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|�����|����� ���������� �������������� �����"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:387
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|�����|����� ���������� ��������� ��������� ����� "
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:389
 msgid "|N|use compress algorithm N"
 msgstr "|N|����� ���������� ��������� N"
 
-#: sm/gpgsm.c:522
+#: sm/gpgsm.c:528
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: sm/gpgsm.c:525
+#: sm/gpgsm.c:531
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7382,31 +7507,36 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: sm/gpgsm.c:604
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "�����: gpg [��������] "
 
-#: sm/gpgsm.c:685
+#: sm/gpgsm.c:691
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
 
-#: sm/gpgsm.c:1237
+#: sm/gpgsm.c:713
+#, fuzzy, c-format
+msgid "unknown validation model `%s'\n"
+msgstr "�������� ��������������� ���������� `%s'\n"
+
+#: sm/gpgsm.c:1264
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1316
+#: sm/gpgsm.c:1344
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "������� ���  `%s'\n"
 
-#: sm/gpgsm.c:1334
+#: sm/gpgsm.c:1362
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: sm/gpgsm.c:1529
+#: sm/gpgsm.c:1543
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7429,7 +7559,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:375
+#: sm/import.c:541 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
@@ -7513,7 +7643,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234
+#: sm/qualified.c:234 sm/verify.c:536
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7532,30 +7662,37 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 
-#: sm/verify.c:386
+#: sm/verify.c:388
 #, fuzzy
 msgid "Signature made "
 msgstr "�������� ����� ���� %s.\n"
 
-#: sm/verify.c:390
+#: sm/verify.c:392
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:391
-#, c-format
-msgid " using certificate ID %08lX\n"
-msgstr ""
+#: sm/verify.c:393
+#, fuzzy, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: sm/verify.c:507
+#: sm/verify.c:514
 #, fuzzy
 msgid "Good signature from"
 msgstr "���� �������� ��� \""
 
-#: sm/verify.c:508
+#: sm/verify.c:515
 #, fuzzy
 msgid "                aka"
 msgstr "                ������ ��� \""
 
+#: sm/verify.c:533
+#, fuzzy
+msgid "This is a qualified signature\n"
+msgstr ""
+"\n"
+"���� �� ����� ��� ����-��������.\n"
+
 #: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
@@ -7592,132 +7729,137 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:315
+#: tools/gpg-connect-agent.c:314
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:323
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:382
+#: tools/gpg-connect-agent.c:381
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "� ������ ����� ���� ������\n"
 
-#: tools/gpg-connect-agent.c:386
+#: tools/gpg-connect-agent.c:385
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:458
+#: tools/gpg-connect-agent.c:457
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
 
-#: tools/gpg-connect-agent.c:466
+#: tools/gpg-connect-agent.c:465
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "� �������� �������: %s\n"
 
-#: tools/gpg-connect-agent.c:474
+#: tools/gpg-connect-agent.c:473
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: tools/gpg-connect-agent.c:784
+#: tools/gpg-connect-agent.c:789
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "������ ��� �������� ���� �� `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:793
+#: tools/gpg-connect-agent.c:798
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "������ ��� �������� ���� �� `%s': %s\n"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
+#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
-#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
+#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
-#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:501
+#: tools/gpgconf-comp.c:492
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:505
+#: tools/gpgconf-comp.c:496
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:509
+#: tools/gpgconf-comp.c:500
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:510
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:638
+#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#, fuzzy
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|�����|������������� ��� �����"
+
+#: tools/gpgconf-comp.c:635
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:640
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|�����|����� ���������� �������������� ����� ��� ������� �������"
 
-#: tools/gpgconf-comp.c:705
+#: tools/gpgconf-comp.c:708
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:749
+#: tools/gpgconf-comp.c:752
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:785
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:806
+#: tools/gpgconf-comp.c:809
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:814
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:848
+#: tools/gpgconf-comp.c:851
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2681
+#: tools/gpgconf-comp.c:2684
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8339,9 +8481,6 @@ msgstr "��� ������������� � ���������� ���������� %d%s\n"
 #~ msgid "q"
 #~ msgstr "q"
 
-#~ msgid "help"
-#~ msgstr "help"
-
 #~ msgid "list"
 #~ msgstr "list"
 
diff --git a/po/eo.po b/po/eo.po
index 0ebf1d23a..13888803e 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-07-05 18:01+0200\n"
+"POT-Creation-Date: 2007-08-10 15:49+0200\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -19,54 +19,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: agent/call-pinentry.c:426
+#: agent/call-pinentry.c:436
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:429
+#: agent/call-pinentry.c:439
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/call-pinentry.c:476
+#: agent/call-pinentry.c:486
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
+#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
 #, fuzzy
 msgid "PIN too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: agent/call-pinentry.c:497
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: agent/call-pinentry.c:505
+#: agent/call-pinentry.c:515
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nevalida signo en nomo\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:520
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:522
+#: agent/call-pinentry.c:532
 #, fuzzy
 msgid "Bad PIN"
 msgstr "malbona MPI"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:533
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "malbona pasfrazo"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:569
 #, fuzzy
 msgid "Passphrase"
 msgstr "malbona pasfrazo"
@@ -83,14 +83,14 @@ msgstr "protekto-metodo %d%s ne estas realigita\n"
 msgid "can't create `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
 #: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
-#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1796
+#: sm/gpgsm.c:1833 sm/gpgsm.c:1871 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
@@ -178,35 +178,46 @@ msgstr[1] ""
 msgid "Take this one anyway"
 msgstr "�u tamen uzi �i tiun �losilon? "
 
-#: agent/genkey.c:99
+#: agent/genkey.c:99 agent/genkey.c:114
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Donu pasfrazon\n"
 
-#: agent/genkey.c:144
+#: agent/genkey.c:107
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+
+#: agent/genkey.c:113
+msgid "Yes, protection is not needed"
+msgstr ""
+
+#: agent/genkey.c:158
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
+#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
 #: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:263
+#: agent/genkey.c:280
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -216,247 +227,247 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:103
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
-#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
 #: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detala eligo"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
-#: sm/gpgsm.c:337
+#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:109
+#: agent/gpg-agent.c:118 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:119
+#: agent/gpg-agent.c:125 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:125
+#: agent/gpg-agent.c:126
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "ser�i �losilojn �e �losilservilo"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:129
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualigi la fido-datenaron"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:145
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:206 sm/gpgsm.c:525 tools/gpg-connect-agent.c:124
 #: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Bonvolu raporti cimojn al <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:262
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
+#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
-#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:340 sm/gpgsm.c:772 sm/gpgsm.c:775 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
+#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:863
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
-#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: scd/scdaemon.c:421 sm/gpgsm.c:867 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
+#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:874
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
-#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:921
+#: agent/gpg-agent.c:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
+#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:908
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
+#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
-#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
+#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
+#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
+#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: dosierujo kreita\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1377
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1381
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1497
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1519
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
+#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
+#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu �losiloj ignoritaj\n"
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1752
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
-#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:751
+#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
-#: tools/gpg-connect-agent.c:762
+#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
@@ -521,42 +532,42 @@ msgstr "eraro dum kreado de pasfrazo: %s\n"
 msgid "cancelled\n"
 msgstr "nuligita de uzanto\n"
 
-#: agent/trustlist.c:131 agent/trustlist.c:319
+#: agent/trustlist.c:132 agent/trustlist.c:322
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: agent/trustlist.c:146
+#: agent/trustlist.c:147
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: agent/trustlist.c:166 agent/trustlist.c:174
+#: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:180
+#: agent/trustlist.c:181
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "sekretaj �losilpartoj ne estas disponataj\n"
 
-#: agent/trustlist.c:215
+#: agent/trustlist.c:216
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "kiraso: %s\n"
 
-#: agent/trustlist.c:241 agent/trustlist.c:248
+#: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:280
+#: agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: agent/trustlist.c:381 agent/trustlist.c:420
+#: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -569,7 +580,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:496
+#: agent/trustlist.c:507
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -579,7 +590,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:505
+#: agent/trustlist.c:516
 msgid "Correct"
 msgstr ""
 
@@ -591,58 +602,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:525
+#: agent/trustlist.c:536
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 #, fuzzy
 msgid "Yes"
 msgstr "jes"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:393
+#: common/exechelp.c:302 common/exechelp.c:390
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: common/exechelp.c:369 common/exechelp.c:426
+#: common/exechelp.c:366 common/exechelp.c:423
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: common/exechelp.c:405 common/exechelp.c:635
+#: common/exechelp.c:402 common/exechelp.c:632
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: common/exechelp.c:461 common/exechelp.c:504
+#: common/exechelp.c:458 common/exechelp.c:501
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:469
+#: common/exechelp.c:466
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: common/exechelp.c:475 common/exechelp.c:515
+#: common/exechelp.c:472 common/exechelp.c:512
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: common/exechelp.c:510
+#: common/exechelp.c:507
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:521
+#: common/exechelp.c:518
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -661,26 +672,26 @@ msgstr "%s: uzanto ne trovita\n"
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
-#: common/simple-pwquery.c:376
+#: common/simple-pwquery.c:373
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ne povas konekti�i al '%s': %s\n"
 
-#: common/simple-pwquery.c:387
+#: common/simple-pwquery.c:384
 msgid "communication problem with gpg-agent\n"
 msgstr "komunikproblemo kun gpg-agent\n"
 
-#: common/simple-pwquery.c:397
+#: common/simple-pwquery.c:394
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
 
-#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+#: common/simple-pwquery.c:557 common/simple-pwquery.c:653
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "nuligita de uzanto\n"
 
-#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+#: common/simple-pwquery.c:572 common/simple-pwquery.c:659
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
@@ -865,7 +876,7 @@ msgstr "AVERTO: nevalida notacia dateno trovita\n"
 msgid "not human readable"
 msgstr "ne homlegebla"
 
-#: g10/card-util.c:62 g10/card-util.c:305
+#: g10/card-util.c:62 g10/card-util.c:308
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "sekreta �losilo ne havebla"
@@ -875,166 +886,166 @@ msgstr "sekreta �losilo ne havebla"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1391 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "ne povas fari tion en neinteraga re�imo\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
 #: g10/keygen.c:1644
 msgid "Your selection? "
 msgstr "Via elekto? "
 
-#: g10/card-util.c:215 g10/card-util.c:265
+#: g10/card-util.c:218 g10/card-util.c:268
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:412
+#: g10/card-util.c:415
 #, fuzzy
 msgid "male"
 msgstr "en"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 #, fuzzy
 msgid "female"
 msgstr "en"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 #, fuzzy
 msgid "unspecified"
 msgstr "Nenia kialo specifita"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 #, fuzzy
 msgid "not forced"
 msgstr "ne traktita"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:521
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:523
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:525
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:539
+#: g10/card-util.c:542
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:544
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:562
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:580
+#: g10/card-util.c:583
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/card-util.c:588
+#: g10/card-util.c:591
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
+#: g10/card-util.c:689 g10/card-util.c:758 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/card-util.c:694
+#: g10/card-util.c:697
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:704
+#: g10/card-util.c:707
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:763
+#: g10/card-util.c:766
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:773
+#: g10/card-util.c:776
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:793
+#: g10/card-util.c:796
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualigitaj preferoj"
 
-#: g10/card-util.c:801
+#: g10/card-util.c:804
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:813
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/card-util.c:831
+#: g10/card-util.c:834
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:845
+#: g10/card-util.c:848
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:866
+#: g10/card-util.c:869
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingrospuro:"
 
-#: g10/card-util.c:889
+#: g10/card-util.c:892
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:937
+#: g10/card-util.c:940
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:941
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/card-util.c:947
+#: g10/card-util.c:950
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: g10/card-util.c:1031
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1051 g10/card-util.c:1060
+#: g10/card-util.c:1054 g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1075
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1084
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1042,136 +1053,136 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1115
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/card-util.c:1117 g10/card-util.c:1194
+#: g10/card-util.c:1120 g10/card-util.c:1197
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/card-util.c:1118 g10/card-util.c:1196
+#: g10/card-util.c:1121 g10/card-util.c:1199
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1198
+#: g10/card-util.c:1122 g10/card-util.c:1201
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1135 g10/card-util.c:1214 g10/keyedit.c:945
+#: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
 #: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
-#: g10/card-util.c:1191
+#: g10/card-util.c:1194
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Kialo por revoko: "
 
-#: g10/card-util.c:1226
+#: g10/card-util.c:1229
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nekonata densig-metodo"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1234
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1239
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/card-util.c:1304 g10/keyedit.c:1362
+#: g10/card-util.c:1307 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "forlasi �i tiun menuon"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1309
 #, fuzzy
 msgid "show admin commands"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1307 g10/keyedit.c:1365
+#: g10/card-util.c:1310 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "montri �i tiun helpon"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1312
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenia helpo disponata"
 
-#: g10/card-util.c:1312
+#: g10/card-util.c:1315
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1313
+#: g10/card-util.c:1316
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1317
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1315
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "change the login name"
 msgstr "�an�i la daton de eksvalidi�o"
 
-#: g10/card-util.c:1316
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "change the language preferences"
 msgstr "�an�i la posedantofidon"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1320
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1322
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1323
 #, fuzzy
 msgid "generate new keys"
 msgstr "krei novan �losilparon"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1324
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1325
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442 g10/keyedit.c:1634
+#: g10/card-util.c:1445 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Komando> "
 
-#: g10/card-util.c:1480
+#: g10/card-util.c:1483
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1511
+#: g10/card-util.c:1514
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1513
+#: g10/card-util.c:1516
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/card-util.c:1587 g10/keyedit.c:2255
+#: g10/card-util.c:1590 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
@@ -1179,7 +1190,7 @@ msgstr "Nevalida komando (provu per \"helpo\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por �i tiu komando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
@@ -1477,7 +1488,7 @@ msgstr "uzas flankan �losilon %08lX anstata� la �efa �losilo %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1493,27 +1504,27 @@ msgstr "|[dosiero]|fari subskribon"
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/gpg.c:372 sm/gpgsm.c:244
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "�ifri datenojn"
 
-#: g10/gpg.c:375 sm/gpgsm.c:246
+#: g10/gpg.c:375 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "�ifri nur kun simetria �ifro"
 
-#: g10/gpg.c:377 sm/gpgsm.c:247
+#: g10/gpg.c:377 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "mal�ifri datenojn (implicita elekto)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:248
+#: g10/gpg.c:379 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/gpg.c:381 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "listigi �losilojn"
 
@@ -1526,11 +1537,11 @@ msgstr "listigi �losilojn kaj subskribojn"
 msgid "list and check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/gpg.c:385 sm/gpgsm.c:254
+#: g10/gpg.c:385 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/gpg.c:386 sm/gpgsm.c:252
+#: g10/gpg.c:386 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
@@ -1566,11 +1577,11 @@ msgstr "krei revokatestilon"
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/gpg.c:397 sm/gpgsm.c:257
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "importi �losilojn de �losilservilo"
 
@@ -1606,11 +1617,11 @@ msgstr "aktualigi la fido-datenaron"
 msgid "|algo [files]|print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/gpg.c:430 sm/gpgsm.c:262
+#: g10/gpg.c:430 sm/gpgsm.c:264
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
 #: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1621,31 +1632,31 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:279
+#: g10/gpg.c:434 sm/gpgsm.c:281
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/gpg.c:436 sm/gpgsm.c:291
+#: g10/gpg.c:436 sm/gpgsm.c:293
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: g10/gpg.c:447 sm/gpgsm.c:327
+#: g10/gpg.c:447 sm/gpgsm.c:331
 msgid "use this user-id to sign or decrypt"
 msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
 
-#: g10/gpg.c:448 sm/gpgsm.c:330
+#: g10/gpg.c:448 sm/gpgsm.c:334
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:332
+#: g10/gpg.c:453 sm/gpgsm.c:336
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
@@ -1661,7 +1672,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:393
+#: g10/gpg.c:553 sm/gpgsm.c:397
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1669,7 +1680,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:396
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1707,7 +1718,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:532
+#: g10/gpg.c:781 sm/gpgsm.c:538
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1736,7 +1747,7 @@ msgstr "Komento: "
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:669
+#: g10/gpg.c:1045 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
@@ -1812,468 +1823,468 @@ msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1554
+#: 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:1556
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1560
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "montri, en kiu �losilaro estas listigita �losilo"
 
-#: g10/gpg.c:1564
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1827
+#: g10/gpg.c:1825
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1981
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
+#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/gpg.c:2401 g10/gpg.c:2413
+#: g10/gpg.c:2399 g10/gpg.c:2411
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2493
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4084
+#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2528
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2531
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2538
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2541
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2548
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2551
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2558
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2561
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2569
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2571
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2573
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2575
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2579
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2581
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2585
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2587
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2589
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2591
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2598
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2608
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2782
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2787
+#: g10/gpg.c:2785
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2873 sm/gpgsm.c:1220
+#: g10/gpg.c:2871 sm/gpgsm.c:1247
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2875
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2884
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2887
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2902
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/gpg.c:2918
+#: g10/gpg.c:2916
 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:2924
+#: g10/gpg.c:2922
 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:2930
+#: g10/gpg.c:2928
 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:2943
+#: g10/gpg.c:2941
 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:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
+#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1303
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
+#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1311
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3025
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3040
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3042
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3044
 #, 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:3048
+#: g10/gpg.c:3046
 #, 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:3050
+#: g10/gpg.c:3048
 #, 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:3053
+#: g10/gpg.c:3051
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/gpg.c:3057
+#: g10/gpg.c:3055
 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:3064
+#: g10/gpg.c:3062
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3071
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3075
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3079
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3114
+#: g10/gpg.c:3112
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3159
 #, 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:3166
+#: g10/gpg.c:3164
 #, 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:3171
+#: g10/gpg.c:3169
 #, 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:3263
+#: g10/gpg.c:3261
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3272
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3295
+#: g10/gpg.c:3293
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3300
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3302
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3312
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3325
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3327
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3332
+#: g10/gpg.c:3330
 #, 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:3350
+#: g10/gpg.c:3348
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3361
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3376
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3378
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3381
 #, 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:3403
+#: g10/gpg.c:3401
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3410
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3435
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3443
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3447
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3468
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3553
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3555
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3557
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3568
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/gpg.c:3580
+#: g10/gpg.c:3578
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3631
+#: g10/gpg.c:3629
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3639
+#: g10/gpg.c:3637
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3729
+#: g10/gpg.c:3727
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3844
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/gpg.c:3850
+#: g10/gpg.c:3848
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4160
 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:4162
 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:4195
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@ -2288,7 +2299,7 @@ msgstr "�u forvi�i �i tiun �losilon de la �losilaro? "
 msgid "make timestamp conflicts only a warning"
 msgstr "malkongruo de tempostampoj"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:368
+#: g10/gpgv.c:75 sm/gpgsm.c:372
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
@@ -6731,64 +6742,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: scd/scdaemon.c:105
+#: scd/scdaemon.c:108
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:357
+#: scd/scdaemon.c:114 sm/gpgsm.c:361
 #, fuzzy
 msgid "read options from file"
 msgstr "legas opciojn el '%s'\n"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:124
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:129
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "tute ne uzi la terminalon"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:134
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:135
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "malkongruaj komandoj\n"
 
-#: scd/scdaemon.c:206
+#: scd/scdaemon.c:209
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: scd/scdaemon.c:208
+#: scd/scdaemon.c:211
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:671
+#: scd/scdaemon.c:658
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1019
+#: scd/scdaemon.c:1006
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1024
+#: scd/scdaemon.c:1011
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6817,152 +6828,269 @@ msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:174
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr ""
+
+#: sm/certchain.c:195
+msgid "chain"
+msgstr ""
+
+#: sm/certchain.c:196
+#, fuzzy
+msgid "shell"
+msgstr "helpo"
+
+#: sm/certchain.c:241
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
 
-#: sm/certchain.c:212
+#: sm/certchain.c:279
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:250
+#: sm/certchain.c:317
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:260
+#: sm/certchain.c:327
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: sm/certchain.c:267 sm/certchain.c:296
+#: sm/certchain.c:334 sm/certchain.c:363
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:271 sm/certchain.c:300
+#: sm/certchain.c:338 sm/certchain.c:367
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: sm/certchain.c:411
+#: sm/certchain.c:478
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:431
+#: sm/certchain.c:498
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: sm/certchain.c:675
+#: sm/certchain.c:742
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "�losilo %08lX: �losilo estas revokita!\n"
 
-#: sm/certchain.c:684
+#: sm/certchain.c:752
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Bona atestilo"
 
-#: sm/certchain.c:688
+#: sm/certchain.c:757
+msgid "the status of the certificate is unknown"
+msgstr ""
+
+#: sm/certchain.c:762
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Nenia helpo disponata"
 
-#: sm/certchain.c:690
+#: sm/certchain.c:764
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:695
+#: sm/certchain.c:770
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: sm/certchain.c:791
-#, fuzzy
-msgid "no issuer found in certificate"
-msgstr "Bona atestilo"
-
-#: sm/certchain.c:820
+#: sm/certchain.c:799 sm/certchain.c:867
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "problemo �e legado de atestilo: %s\n"
 
-#: sm/certchain.c:836
+#: sm/certchain.c:814 sm/certchain.c:899
 #, fuzzy
 msgid "certificate not yet valid"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:849
+#: sm/certchain.c:815 sm/certchain.c:900
+#, fuzzy
+msgid "root certificate not yet valid"
+msgstr "Valida atestilrevoko"
+
+#: sm/certchain.c:816 sm/certchain.c:901
+#, fuzzy
+msgid "intermediate certificate not yet valid"
+msgstr "Valida atestilrevoko"
+
+#: sm/certchain.c:829
 #, fuzzy
 msgid "certificate has expired"
 msgstr "problemo �e legado de atestilo: %s\n"
 
-#: sm/certchain.c:892
-msgid "self-signed certificate has a BAD signature"
+#: sm/certchain.c:830
+#, fuzzy
+msgid "root certificate has expired"
+msgstr "problemo �e legado de atestilo: %s\n"
+
+#: sm/certchain.c:831
+#, fuzzy
+msgid "intermediate certificate has expired"
+msgstr "problemo �e legado de atestilo: %s\n"
+
+#: sm/certchain.c:873
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:960
+#: sm/certchain.c:882
 #, fuzzy
-msgid "root certificate is not marked trusted"
+msgid "certificate with invalid validity"
+msgstr "problemo �e legado de atestilo: %s\n"
+
+#: sm/certchain.c:919
+msgid "signature not created during lifetime of certificate"
 msgstr ""
-"Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
-"\n"
 
-#: sm/certchain.c:975
+#: sm/certchain.c:921
+msgid "certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:922
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:926
+#, fuzzy
+msgid "  (  signature created at "
+msgstr "            novaj subskriboj: %lu\n"
+
+#: sm/certchain.c:927
+#, fuzzy
+msgid "  (certificate created at "
+msgstr "�losilo %08lX: revokatestilo aldonita\n"
+
+#: sm/certchain.c:930
+#, fuzzy
+msgid "  (certificate valid from "
+msgstr "Valida atestilrevoko"
+
+#: sm/certchain.c:931
+msgid "  (     issuer valid from "
+msgstr ""
+
+#: sm/certchain.c:961
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Fingrospuro:"
 
-#: sm/certchain.c:983
+#: sm/certchain.c:970
 #, fuzzy
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
 "\n"
 
-#: sm/certchain.c:998
+#: sm/certchain.c:983
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1004
+#: sm/certchain.c:989
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1046
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr ""
+
+#: sm/certchain.c:1110
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "Bona atestilo"
+
+#: sm/certchain.c:1184
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:1253
+#, fuzzy
+msgid "root certificate is not marked trusted"
+msgstr ""
+"Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
+"\n"
+
+#: sm/certchain.c:1266
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: sm/certchain.c:1041 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:157
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1053
+#: sm/certchain.c:1307
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1086
+#: sm/certchain.c:1340
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "kontroli subskribon"
 
-#: sm/certchain.c:1116
+#: sm/certchain.c:1371
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1167
+#: sm/certchain.c:1422
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
+#: sm/certchain.c:1462 sm/certchain.c:1730
+#, fuzzy
+msgid "certificate is good\n"
+msgstr "Valida atestilrevoko"
+
+#: sm/certchain.c:1463
+#, fuzzy
+msgid "intermediate certificate is good\n"
+msgstr "ripetita atestilo - forvi�ita"
+
+#: sm/certchain.c:1464
+#, fuzzy
+msgid "root certificate is good\n"
+msgstr ""
+"Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
+"\n"
+
+#: sm/certchain.c:1620
+msgid "switching to chain model"
+msgstr ""
+
+#: sm/certchain.c:1629
+#, c-format
+msgid "validation model used: %s"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "chain model"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "shell model"
+msgstr ""
+
 #: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
@@ -7010,7 +7138,7 @@ msgstr "%s: nevalida dosiero-versio %d\n"
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
 "\"%s\"\n"
-"S/N %s, ID %08lX, created %s"
+"S/N %s, ID 0x%08lX, created %s"
 msgstr ""
 "Vi bezonas pasfrazon por mal�losi la sekretan �losilon por la uzanto:\n"
 "\"%.*s\"\n"
@@ -7020,7 +7148,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:131 sm/keylist.c:255
+#: sm/certlist.c:131 sm/keylist.c:258
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
@@ -7142,181 +7270,181 @@ msgstr "eraro dum kreado de pasfrazo: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "skribas al '%s'\n"
 
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: sm/gpgsm.c:251
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list external keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Valida atestilrevoko"
 
-#: sm/gpgsm.c:256
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "forigi �losilojn de la publika �losilaro"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "import certificates"
 msgstr "Bona atestilo"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:262
 #, fuzzy
 msgid "export certificates"
 msgstr "Bona atestilo"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:268
 #, fuzzy
 msgid "change a passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "krei eligon en askia kiraso"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:287
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:296
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:302
+#: sm/gpgsm.c:304
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:305
+#: sm/gpgsm.c:309
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:312
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:315
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:319
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:323
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:325
 msgid "use the default key as default recipient"
 msgstr "uzi la implicitan �losilon kiel implicitan ricevonton"
 
-#: sm/gpgsm.c:338
+#: sm/gpgsm.c:342
 msgid "don't use the terminal at all"
 msgstr "tute ne uzi la terminalon"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:346
 msgid "force v3 signatures"
 msgstr "devigi v3-subskribojn"
 
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:347
 msgid "always use a MDC for encryption"
 msgstr "�iam uzi sigelon (MDC) por �ifrado"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:352
 msgid "batch mode: never ask"
 msgstr "neinteraga re�imo: neniam demandi"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:353
 msgid "assume yes on most questions"
 msgstr "supozi \"jes\" �e la plej multaj demandoj"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:354
 msgid "assume no on most questions"
 msgstr "supozi \"ne\" �e la plej multaj demandoj"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:356
 msgid "add this keyring to the list of keyrings"
 msgstr "aldoni �i tiun �losilaron al la listo de �losilaroj"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:357
 msgid "add this secret keyring to the list"
 msgstr "aldoni �i tiun sekretan �losilaron al la listo"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:359
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVILO|uzi �i tiun �losilservilon por ser�i �losilojn"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:360
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:364
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:375
+#: sm/gpgsm.c:379
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: sm/gpgsm.c:381
+#: sm/gpgsm.c:385
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:387
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMO|uzi kompendi-metodon NOMO"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:389
 msgid "|N|use compress algorithm N"
 msgstr "|N|uzi densig-metodon N"
 
-#: sm/gpgsm.c:522
+#: sm/gpgsm.c:528
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: sm/gpgsm.c:525
+#: sm/gpgsm.c:531
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7327,31 +7455,36 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: sm/gpgsm.c:604
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: sm/gpgsm.c:685
+#: sm/gpgsm.c:691
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "ne povas konekti�i al '%s': %s\n"
 
-#: sm/gpgsm.c:1237
+#: sm/gpgsm.c:713
+#, fuzzy, c-format
+msgid "unknown validation model `%s'\n"
+msgstr "nekonata implicita ricevonto '%s'\n"
+
+#: sm/gpgsm.c:1264
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1316
+#: sm/gpgsm.c:1344
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: sm/gpgsm.c:1334
+#: sm/gpgsm.c:1362
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: sm/gpgsm.c:1529
+#: sm/gpgsm.c:1543
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7374,7 +7507,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:375
+#: sm/import.c:541 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -7458,7 +7591,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234
+#: sm/qualified.c:234 sm/verify.c:536
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7477,30 +7610,35 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: sm/verify.c:386
+#: sm/verify.c:388
 #, fuzzy
 msgid "Signature made "
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: sm/verify.c:390
+#: sm/verify.c:392
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:391
-#, c-format
-msgid " using certificate ID %08lX\n"
-msgstr ""
+#: sm/verify.c:393
+#, fuzzy, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: sm/verify.c:507
+#: sm/verify.c:514
 #, fuzzy
 msgid "Good signature from"
 msgstr "Bona subskribo de \""
 
-#: sm/verify.c:508
+#: sm/verify.c:515
 #, fuzzy
 msgid "                aka"
 msgstr "            alinome \""
 
+#: sm/verify.c:533
+#, fuzzy
+msgid "This is a qualified signature\n"
+msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
+
 #: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
@@ -7537,132 +7675,137 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:315
+#: tools/gpg-connect-agent.c:314
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:323
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:382
+#: tools/gpg-connect-agent.c:381
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "pasfrazo estas tro longa\n"
 
-#: tools/gpg-connect-agent.c:386
+#: tools/gpg-connect-agent.c:385
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:458
+#: tools/gpg-connect-agent.c:457
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: tools/gpg-connect-agent.c:466
+#: tools/gpg-connect-agent.c:465
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: tools/gpg-connect-agent.c:474
+#: tools/gpg-connect-agent.c:473
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: tools/gpg-connect-agent.c:784
+#: tools/gpg-connect-agent.c:789
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: tools/gpg-connect-agent.c:793
+#: tools/gpg-connect-agent.c:798
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
+#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
-#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
+#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
-#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:501
+#: tools/gpgconf-comp.c:492
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:505
+#: tools/gpgconf-comp.c:496
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:509
+#: tools/gpgconf-comp.c:500
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:510
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:638
+#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#, fuzzy
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NOMO|�ifri por NOMO"
+
+#: tools/gpgconf-comp.c:635
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:640
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO por pasfrazoj"
 
-#: tools/gpgconf-comp.c:705
+#: tools/gpgconf-comp.c:708
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:749
+#: tools/gpgconf-comp.c:752
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:785
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:806
+#: tools/gpgconf-comp.c:809
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:814
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:848
+#: tools/gpgconf-comp.c:851
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2681
+#: tools/gpgconf-comp.c:2684
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8262,9 +8405,6 @@ msgstr "protekto-metodo %d%s ne estas realigita\n"
 #~ msgid "q"
 #~ msgstr "f"
 
-#~ msgid "help"
-#~ msgstr "helpo"
-
 #~ msgid "list"
 #~ msgstr "listo"
 
diff --git a/po/es.po b/po/es.po
index db2d30ed6..2182998d6 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-07-05 18:01+0200\n"
+"POT-Creation-Date: 2007-08-10 15:49+0200\n"
 "PO-Revision-Date: 2005-03-25 16:50+0100\n"
 "Last-Translator: Jaime Su�rez <jsuarez@ono.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -23,44 +23,44 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "fallo al almacenar la huella digital: %s\n"
 
-#: agent/call-pinentry.c:426
+#: agent/call-pinentry.c:436
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:429
+#: agent/call-pinentry.c:439
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
 
-#: agent/call-pinentry.c:476
+#: agent/call-pinentry.c:486
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
+#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
 #, fuzzy
 msgid "PIN too long"
 msgstr "l�nea demasiado larga"
 
-#: agent/call-pinentry.c:497
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "frase contrase�a demasiado larga\n"
 
-#: agent/call-pinentry.c:505
+#: agent/call-pinentry.c:515
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter inv�lido en el nombre\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:520
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:522
+#: agent/call-pinentry.c:532
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorrecto"
@@ -74,7 +74,7 @@ msgstr "MPI incorrecto"
 # �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
 # �Es que son m�s listos? :-)
 #
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:533
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "Frase contrase�a incorrecta"
@@ -88,7 +88,7 @@ msgstr "Frase contrase�a incorrecta"
 # �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
 # �Es que son m�s listos? :-)
 #
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:569
 #, fuzzy
 msgid "Passphrase"
 msgstr "Frase contrase�a incorrecta"
@@ -105,14 +105,14 @@ msgstr "el resumen protector %d no puede ser utilizado\n"
 msgid "can't create `%s': %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
 #: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
-#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1796
+#: sm/gpgsm.c:1833 sm/gpgsm.c:1871 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no se puede abrir `%s': %s\n"
@@ -199,35 +199,46 @@ msgstr[1] ""
 msgid "Take this one anyway"
 msgstr "�Usar esta clave de todas formas? (s/N) "
 
-#: agent/genkey.c:99
+#: agent/genkey.c:99 agent/genkey.c:114
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Introduzca frase contrase�a\n"
 
-#: agent/genkey.c:144
+#: agent/genkey.c:107
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+
+#: agent/genkey.c:113
+msgid "Yes, protection is not needed"
+msgstr ""
+
+#: agent/genkey.c:158
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Necesita una frase contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
+#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "cambia la frase contrase�a"
 
-#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
 #: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:263
+#: agent/genkey.c:280
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "cambia la frase contrase�a"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -237,248 +248,248 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:103
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
-#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
 #: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "prolijo"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
-#: sm/gpgsm.c:337
+#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "algo m�s discreto"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:109
+#: agent/gpg-agent.c:118 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:119
+#: agent/gpg-agent.c:125 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:125
+#: agent/gpg-agent.c:126
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "busca claves en un servidor de claves"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:129
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "establecer preferencias para todos los ID seleccionados"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualiza la base de datos de confianza"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:145
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "error creando frase contrase�a: %s\n"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:206 sm/gpgsm.c:525 tools/gpg-connect-agent.c:124
 #: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Por favor, informe de posibles \"bugs\" a <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:262
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
+#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
-#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:340 sm/gpgsm.c:772 sm/gpgsm.c:775 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
+#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:863
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
-#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: scd/scdaemon.c:421 sm/gpgsm.c:867 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
+#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:874
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "error creando `%s': %s\n"
 
-#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
-#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:921
+#: agent/gpg-agent.c:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
+#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:908
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "no se puede crear el directorio `%s': %s\n"
 
-#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
+#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "el agente gpg no esta disponible en esta sesi�n\n"
 
-#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
+#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "error enviando a `%s': %s\n"
 
-#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
+#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
+#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "directorio `%s' creado\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1377
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) fall� en %s: %s\n"
 
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1381
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: no se puede crear el directorio: %s\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1497
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1519
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
+#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
 # msgstr "clave %08lX: %d nuevas subclaves\n"
-#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
+#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu claves omitidas\n"
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1752
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "el agente gpg no esta disponible en esta sesi�n\n"
 
-#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:751
+#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
 
-#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
-#: tools/gpg-connect-agent.c:762
+#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "el programa no permite usar el protocolo agente gpg versi�n %d\n"
@@ -552,42 +563,42 @@ msgstr "error creando frase contrase�a: %s\n"
 msgid "cancelled\n"
 msgstr "cancelado"
 
-#: agent/trustlist.c:131 agent/trustlist.c:319
+#: agent/trustlist.c:132 agent/trustlist.c:322
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "error en `%s': %s\n"
 
-#: agent/trustlist.c:146
+#: agent/trustlist.c:147
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: agent/trustlist.c:166 agent/trustlist.c:174
+#: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:180
+#: agent/trustlist.c:181
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "las partes de la clave privada no est�n disponibles\n"
 
-#: agent/trustlist.c:215
+#: agent/trustlist.c:216
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "error de lectura `%s': %s\n"
 
-#: agent/trustlist.c:241 agent/trustlist.c:248
+#: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:280
+#: agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: agent/trustlist.c:381 agent/trustlist.c:420
+#: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -600,7 +611,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:496
+#: agent/trustlist.c:507
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -610,7 +621,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:505
+#: agent/trustlist.c:516
 msgid "Correct"
 msgstr ""
 
@@ -622,58 +633,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:525
+#: agent/trustlist.c:536
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 #, fuzzy
 msgid "Yes"
 msgstr "s�"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:393
+#: common/exechelp.c:302 common/exechelp.c:390
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
 
-#: common/exechelp.c:369 common/exechelp.c:426
+#: common/exechelp.c:366 common/exechelp.c:423
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "no puede abrirse el fichero: %s\n"
 
-#: common/exechelp.c:405 common/exechelp.c:635
+#: common/exechelp.c:402 common/exechelp.c:632
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: common/exechelp.c:461 common/exechelp.c:504
+#: common/exechelp.c:458 common/exechelp.c:501
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:469
+#: common/exechelp.c:466
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "error obteniendo la informaci�n actual de la clave: %s\n"
 
-#: common/exechelp.c:475 common/exechelp.c:515
+#: common/exechelp.c:472 common/exechelp.c:512
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: common/exechelp.c:510
+#: common/exechelp.c:507
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:521
+#: common/exechelp.c:518
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "error leyendo `%s': %s\n"
@@ -692,26 +703,26 @@ msgstr "%s: usuario no encontrado\n"
 msgid "gpg-agent is not available in this session\n"
 msgstr "el agente gpg no esta disponible en esta sesi�n\n"
 
-#: common/simple-pwquery.c:376
+#: common/simple-pwquery.c:373
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no se puede conectar con `%s': %s\n"
 
-#: common/simple-pwquery.c:387
+#: common/simple-pwquery.c:384
 msgid "communication problem with gpg-agent\n"
 msgstr "problema de comunicaci�n con el agente gpg\n"
 
-#: common/simple-pwquery.c:397
+#: common/simple-pwquery.c:394
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "problema con el agente: el agente devuelve 0x%lx\n"
 
-#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+#: common/simple-pwquery.c:557 common/simple-pwquery.c:653
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "cancelado por el usuario\n"
 
-#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+#: common/simple-pwquery.c:572 common/simple-pwquery.c:659
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problema con el agente: el agente devuelve 0x%lx\n"
@@ -890,7 +901,7 @@ msgstr "ATENCI�N: encontrados datos de notaci�n inv�lidos\n"
 msgid "not human readable"
 msgstr "ilegible"
 
-#: g10/card-util.c:62 g10/card-util.c:305
+#: g10/card-util.c:62 g10/card-util.c:308
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "tarjeta OpenPGP no disponible: %s\n"
@@ -900,155 +911,155 @@ 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:75 g10/card-util.c:1391 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
 #: g10/keygen.c:1644
 msgid "Your selection? "
 msgstr "Su elecci�n: "
 
-#: g10/card-util.c:215 g10/card-util.c:265
+#: g10/card-util.c:218 g10/card-util.c:268
 msgid "[not set]"
 msgstr "[no establecido]"
 
-#: g10/card-util.c:412
+#: g10/card-util.c:415
 msgid "male"
 msgstr "hombre"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "female"
 msgstr "mujer"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "unspecified"
 msgstr "no especificado"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "not forced"
 msgstr "no forzado"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "forced"
 msgstr "forzado"
 
-#: g10/card-util.c:518
+#: g10/card-util.c:521
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Error: s�lo se permite ASCII sin formato actualmente.\n"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:523
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Error: El caracter \"<\" no puede usarse.\n"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:525
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Error: no se permiten dobles espacios.\n"
 
-#: g10/card-util.c:539
+#: g10/card-util.c:542
 msgid "Cardholder's surname: "
 msgstr "Apellido del titular de la tarjeta: "
 
-#: g10/card-util.c:541
+#: g10/card-util.c:544
 msgid "Cardholder's given name: "
 msgstr "Nombre del titular de la tarjeta: "
 
-#: g10/card-util.c:559
+#: g10/card-util.c:562
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Error: nombre combinado demasiado largo (m�ximo %d caracteres).\n"
 
-#: g10/card-util.c:580
+#: g10/card-util.c:583
 msgid "URL to retrieve public key: "
 msgstr "URL de donde recuperar la clave p�blica: "
 
-#: g10/card-util.c:588
+#: g10/card-util.c:591
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Error: URL demasiado larga (el m�ximo son %d caracteres).\n"
 
-#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
+#: g10/card-util.c:689 g10/card-util.c:758 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/card-util.c:694
+#: g10/card-util.c:697
 msgid "Login data (account name): "
 msgstr "Datos de login (nombre de la cuenta): "
 
-#: g10/card-util.c:704
+#: g10/card-util.c:707
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Error: el login es demasiado largo (l�mite de %d caracteres).\n"
 
-#: g10/card-util.c:763
+#: g10/card-util.c:766
 msgid "Private DO data: "
 msgstr "Datos privados: "
 
-#: g10/card-util.c:773
+#: g10/card-util.c:776
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 "Error: los datos privados son demasiado largos (l�mite de %d caracteres).\n"
 
-#: g10/card-util.c:793
+#: g10/card-util.c:796
 msgid "Language preferences: "
 msgstr "Preferencias de idioma: "
 
-#: g10/card-util.c:801
+#: g10/card-util.c:804
 msgid "Error: invalid length of preference string.\n"
 msgstr "Error: longitud de la cadena de preferencias inv�lida.\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:813
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Error: caracteres inv�lidos en cadena de preferencias.\n"
 
-#: g10/card-util.c:831
+#: g10/card-util.c:834
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Sexo ((H)ombre, (M)mujer o espacio): "
 
-#: g10/card-util.c:845
+#: g10/card-util.c:848
 msgid "Error: invalid response.\n"
 msgstr "Error: respuesta no v�lida.\n"
 
-#: g10/card-util.c:866
+#: g10/card-util.c:869
 msgid "CA fingerprint: "
 msgstr "Huella dactilar CA:"
 
-#: g10/card-util.c:889
+#: g10/card-util.c:892
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Error: formato inv�lido de huella dactilar.\n"
 
-#: g10/card-util.c:937
+#: g10/card-util.c:940
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "la operaci�n con la clave no es posible: %s\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:941
 msgid "not an OpenPGP card"
 msgstr "no es una tarjeta OpenPGP"
 
-#: g10/card-util.c:947
+#: g10/card-util.c:950
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "error obteniendo la informaci�n actual de la clave: %s\n"
 
-#: g10/card-util.c:1031
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr "�Reemplazar la clave existente? (s/N) "
 
-#: g10/card-util.c:1051 g10/card-util.c:1060
+#: g10/card-util.c:1054 g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 "�Hacer copia de seguridad externa a la tarjeta de clave de cifrado? (S/n)"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1075
 msgid "Replace existing keys? (y/N) "
 msgstr "�Reemplazar las claves existentes? (s/N) "
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1084
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1059,120 +1070,120 @@ msgstr ""
 "   PIN = `%s'     PIN Administrador = `%s'\n"
 "Deber�a cambiarlos usando la orden --change-pin\n"
 
-#: g10/card-util.c:1115
+#: g10/card-util.c:1118
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor seleccione tipo de clave que generar:\n"
 
-#: g10/card-util.c:1117 g10/card-util.c:1194
+#: g10/card-util.c:1120 g10/card-util.c:1197
 msgid "   (1) Signature key\n"
 msgstr "    (1) Clave de firmado\n"
 
-#: g10/card-util.c:1118 g10/card-util.c:1196
+#: g10/card-util.c:1121 g10/card-util.c:1199
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Clave de cifrado\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1198
+#: g10/card-util.c:1122 g10/card-util.c:1201
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Clave de autentificaci�n\n"
 
-#: g10/card-util.c:1135 g10/card-util.c:1214 g10/keyedit.c:945
+#: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
 #: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Elecci�n inv�lida.\n"
 
-#: g10/card-util.c:1191
+#: g10/card-util.c:1194
 msgid "Please select where to store the key:\n"
 msgstr "Por favor elija donde guardar la clave:\n"
 
-#: g10/card-util.c:1226
+#: g10/card-util.c:1229
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de protecci�n de clave desconocido\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1234
 msgid "secret parts of key are not available\n"
 msgstr "las partes secretas de la clave no est�n disponibles\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1239
 msgid "secret key already stored on a card\n"
 msgstr "clave secreta ya almacenada en una tarjeta\n"
 
-#: g10/card-util.c:1304 g10/keyedit.c:1362
+#: g10/card-util.c:1307 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "sale de este men�"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1309
 msgid "show admin commands"
 msgstr "ver �rdenes de administrador"
 
-#: g10/card-util.c:1307 g10/keyedit.c:1365
+#: g10/card-util.c:1310 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1312
 msgid "list all available data"
 msgstr "listar todos los datos disponibles"
 
-#: g10/card-util.c:1312
+#: g10/card-util.c:1315
 msgid "change card holder's name"
 msgstr "cambiar el nombre del titular de la tarjeta"
 
-#: g10/card-util.c:1313
+#: g10/card-util.c:1316
 msgid "change URL to retrieve key"
 msgstr "cambiar URL de donde obtener la clave"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1317
 msgid "fetch the key specified in the card URL"
 msgstr "recuperar la clave especificada en la URL de la tarjeta"
 
-#: g10/card-util.c:1315
+#: g10/card-util.c:1318
 msgid "change the login name"
 msgstr "cambiar nombre de usuario"
 
-#: g10/card-util.c:1316
+#: g10/card-util.c:1319
 msgid "change the language preferences"
 msgstr "cambiar preferencias de idioma"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1320
 msgid "change card holder's sex"
 msgstr "cambiar sexo del titular de la tarjeta"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1321
 msgid "change a CA fingerprint"
 msgstr "cambiar huella dactilar de una CA"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1322
 msgid "toggle the signature force PIN flag"
 msgstr "cambiar estado de la opci�n forzar firma del PIN"
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1323
 msgid "generate new keys"
 msgstr "generar nuevas claves"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1324
 msgid "menu to change or unblock the PIN"
 msgstr "men� para cambiar o desbloquear el PIN"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1325
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442 g10/keyedit.c:1634
+#: g10/card-util.c:1445 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Orden> "
 
-#: g10/card-util.c:1480
+#: g10/card-util.c:1483
 msgid "Admin-only command\n"
 msgstr "�rdenes s�lo de administrador\n"
 
-#: g10/card-util.c:1511
+#: g10/card-util.c:1514
 msgid "Admin commands are allowed\n"
 msgstr "Se permiten �rdenes de administrador\n"
 
-#: g10/card-util.c:1513
+#: g10/card-util.c:1516
 msgid "Admin commands are not allowed\n"
 msgstr "No se permiten �rdenes de administrador\n"
 
-#: g10/card-util.c:1587 g10/keyedit.c:2255
+#: g10/card-util.c:1590 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inv�lida (pruebe \"help\")\n"
 
@@ -1180,7 +1191,7 @@ msgstr "Orden inv�lida (pruebe \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona con esta orden\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no se puede abrir `%s'\n"
@@ -1486,7 +1497,7 @@ msgstr "clave %s: clave secreta sin clave p�blica - omitida\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:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1502,27 +1513,27 @@ msgstr "|[file]|crea una firma"
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|crea una firma en texto claro"
 
-#: g10/gpg.c:372 sm/gpgsm.c:244
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "crea una firma separada"
 
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/gpg.c:375 sm/gpgsm.c:246
+#: g10/gpg.c:375 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/gpg.c:377 sm/gpgsm.c:247
+#: g10/gpg.c:377 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:248
+#: g10/gpg.c:379 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:381 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "lista claves"
 
@@ -1534,11 +1545,11 @@ msgstr "lista claves y firmas"
 msgid "list and check key signatures"
 msgstr "lista y comprueba firmas de las claves"
 
-#: g10/gpg.c:385 sm/gpgsm.c:254
+#: g10/gpg.c:385 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/gpg.c:386 sm/gpgsm.c:252
+#: g10/gpg.c:386 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
@@ -1574,11 +1585,11 @@ msgstr "genera un certificado de revocaci�n"
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/gpg.c:397 sm/gpgsm.c:257
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
@@ -1614,11 +1625,11 @@ msgstr "actualiza la base de datos de confianza"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
-#: g10/gpg.c:430 sm/gpgsm.c:262
+#: g10/gpg.c:430 sm/gpgsm.c:264
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
 #: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1629,31 +1640,31 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:279
+#: g10/gpg.c:434 sm/gpgsm.c:281
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/gpg.c:436 sm/gpgsm.c:291
+#: g10/gpg.c:436 sm/gpgsm.c:293
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/gpg.c:447 sm/gpgsm.c:327
+#: g10/gpg.c:447 sm/gpgsm.c:331
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/gpg.c:448 sm/gpgsm.c:330
+#: g10/gpg.c:448 sm/gpgsm.c:334
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresi�n N (0 no comprime)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:332
+#: g10/gpg.c:453 sm/gpgsm.c:336
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
@@ -1673,7 +1684,7 @@ msgstr "generar mensajes compatibles con PGP 2.x"
 # p�gina man -> p�gina de manual
 # Vale. �del manual mejor?
 # Hmm, no s�, en man-db se usa "de". La verdad es que no lo he pensado.
-#: g10/gpg.c:553 sm/gpgsm.c:393
+#: g10/gpg.c:553 sm/gpgsm.c:397
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1681,7 +1692,7 @@ msgstr ""
 "@\n"
 "(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:396
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1719,7 +1730,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:532
+#: g10/gpg.c:781 sm/gpgsm.c:538
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1747,7 +1758,7 @@ msgstr "Compresi�n: "
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:669
+#: g10/gpg.c:1045 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "�rdenes incompatibles\n"
 
@@ -1829,435 +1840,435 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "art�culo de configuraci�n desconocido `%s'\n"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: 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:1548
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1554
+#: 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:1556
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1560
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "muestra en qu� anillos est� una clave"
 
-#: g10/gpg.c:1564
+#: 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:1827
+#: g10/gpg.c:1825
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1981
 #, 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:2243 g10/gpg.c:2884 g10/gpg.c:2896
+#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/gpg.c:2401 g10/gpg.c:2413
+#: g10/gpg.c:2399 g10/gpg.c:2411
 #, 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:2495
+#: g10/gpg.c:2493
 #, 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:2518 g10/gpg.c:2713 g10/keyedit.c:4084
+#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2528
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2531
 msgid "invalid keyserver options\n"
 msgstr "opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2538
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2541
 msgid "invalid import options\n"
 msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2548
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2551
 msgid "invalid export options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2558
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2561
 msgid "invalid list options\n"
 msgstr "lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2569
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2571
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2573
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2575
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2579
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2581
 #, 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:2585
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2585
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2587
 #, 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
+#: g10/gpg.c:2589
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2591
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2598
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2601
 msgid "invalid verify options\n"
 msgstr "opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2608
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2782
 #, 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:2787
+#: g10/gpg.c:2785
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2873 sm/gpgsm.c:1220
+#: g10/gpg.c:2871 sm/gpgsm.c:1247
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2875
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2884
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2887
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2902
 #, 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:2918
+#: g10/gpg.c:2916
 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:2924
+#: g10/gpg.c:2922
 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:2930
+#: g10/gpg.c:2928
 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:2943
+#: g10/gpg.c:2941
 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:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
+#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1303
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
+#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1311
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de compresi�n seleccionado es inv�lido\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3025
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3040
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3042
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3044
 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:3048
+#: g10/gpg.c:3046
 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:3050
+#: g10/gpg.c:3048
 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:3053
+#: g10/gpg.c:3051
 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:3057
+#: g10/gpg.c:3055
 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:3064
+#: g10/gpg.c:3062
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inv�lidas\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3071
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inv�lidas\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3075
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3079
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresi�n inv�lidas\n"
 
-#: g10/gpg.c:3114
+#: g10/gpg.c:3112
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s a�n no funciona con %s\n"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3159
 #, 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:3166
+#: g10/gpg.c:3164
 #, 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:3171
+#: g10/gpg.c:3169
 #, 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:3263
+#: g10/gpg.c:3261
 #, 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:3274
+#: g10/gpg.c:3272
 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:3295
+#: g10/gpg.c:3293
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3300
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3302
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "el cifrado sim�trico de `%s' fall�: %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3312
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3325
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3327
 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:3332
+#: g10/gpg.c:3330
 #, 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:3350
+#: g10/gpg.c:3348
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3361
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3376
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3378
 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:3383
+#: g10/gpg.c:3381
 #, 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:3403
+#: g10/gpg.c:3401
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3410
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3435
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3443
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3447
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3468
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3553
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "env�o al servidor de claves fallido: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepci�n del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3557
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportaci�n de clave fallida: %s\n"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3568
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "b�squeda del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3580
+#: g10/gpg.c:3578
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovaci�n al servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3631
+#: g10/gpg.c:3629
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3639
+#: g10/gpg.c:3637
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3729
+#: g10/gpg.c:3727
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3844
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -2265,19 +2276,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:3850
+#: g10/gpg.c:3848
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4160
 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:4162
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4195
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
@@ -2293,7 +2304,7 @@ msgstr "tomar las claves de este anillo"
 msgid "make timestamp conflicts only a warning"
 msgstr "hacer que los conflictos de fecha-hora sean s�lo un aviso"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:368
+#: g10/gpgv.c:75 sm/gpgsm.c:372
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe informaci�n de estado en este descriptor de fichero"
 
@@ -6650,64 +6661,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "no se puede acceder a %s - �tarjeta OpenPGP inv�lida?\n"
 
-#: scd/scdaemon.c:105
+#: scd/scdaemon.c:108
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:357
+#: scd/scdaemon.c:114 sm/gpgsm.c:361
 #, fuzzy
 msgid "read options from file"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:124
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:129
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "no usa la terminal en absoluto"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:134
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:135
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "ver �rdenes de administrador"
 
-#: scd/scdaemon.c:206
+#: scd/scdaemon.c:209
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: gpgm [opciones] [ficheros] (-h para ayuda)"
 
-#: scd/scdaemon.c:208
+#: scd/scdaemon.c:211
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:671
+#: scd/scdaemon.c:658
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1019
+#: scd/scdaemon.c:1006
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1024
+#: scd/scdaemon.c:1011
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6736,152 +6747,270 @@ msgstr "el programa no permite usar el protocolo agente gpg versi�n %d\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:174
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr ""
+
+#: sm/certchain.c:195
+msgid "chain"
+msgstr ""
+
+#: sm/certchain.c:196
+#, fuzzy
+msgid "shell"
+msgstr "ayuda"
+
+#: sm/certchain.c:241
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "el programa no permite usar el protocolo agente gpg versi�n %d\n"
 
-#: sm/certchain.c:212
+#: sm/certchain.c:279
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:250
+#: sm/certchain.c:317
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:260
+#: sm/certchain.c:327
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "No se puede abrir `%s': %s\n"
 
-#: sm/certchain.c:267 sm/certchain.c:296
+#: sm/certchain.c:334 sm/certchain.c:363
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:271 sm/certchain.c:300
+#: sm/certchain.c:338 sm/certchain.c:367
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "no se permite exportar claves secretas\n"
 
-#: sm/certchain.c:411
+#: sm/certchain.c:478
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:431
+#: sm/certchain.c:498
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "fallo al almacenar la clave: %s\n"
 
-#: sm/certchain.c:675
+#: sm/certchain.c:742
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: la clave ha sido revocada"
 
-#: sm/certchain.c:684
+#: sm/certchain.c:752
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Certificado correcto"
 
-#: sm/certchain.c:688
+#: sm/certchain.c:757
+msgid "the status of the certificate is unknown"
+msgstr ""
+
+#: sm/certchain.c:762
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Clave disponible en: "
 
-#: sm/certchain.c:690
+#: sm/certchain.c:764
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:695
+#: sm/certchain.c:770
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "la comprobaci�n de la firma creada fall�: %s\n"
 
-#: sm/certchain.c:791
-#, fuzzy
-msgid "no issuer found in certificate"
-msgstr "Certificado correcto"
-
-#: sm/certchain.c:820
+#: sm/certchain.c:799 sm/certchain.c:867
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "problema en la lectura del certificado: %s\n"
 
-#: sm/certchain.c:836
+#: sm/certchain.c:814 sm/certchain.c:899
 #, fuzzy
 msgid "certificate not yet valid"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:849
+#: sm/certchain.c:815 sm/certchain.c:900
+#, fuzzy
+msgid "root certificate not yet valid"
+msgstr "Revocaci�n de certificado v�lida"
+
+#: sm/certchain.c:816 sm/certchain.c:901
+#, fuzzy
+msgid "intermediate certificate not yet valid"
+msgstr "Revocaci�n de certificado v�lida"
+
+#: sm/certchain.c:829
 #, fuzzy
 msgid "certificate has expired"
 msgstr "problema en la lectura del certificado: %s\n"
 
-#: sm/certchain.c:892
-msgid "self-signed certificate has a BAD signature"
+#: sm/certchain.c:830
+#, fuzzy
+msgid "root certificate has expired"
+msgstr "problema en la lectura del certificado: %s\n"
+
+#: sm/certchain.c:831
+#, fuzzy
+msgid "intermediate certificate has expired"
+msgstr "problema en la lectura del certificado: %s\n"
+
+#: sm/certchain.c:873
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:960
+#: sm/certchain.c:882
 #, fuzzy
-msgid "root certificate is not marked trusted"
+msgid "certificate with invalid validity"
+msgstr "problema en la lectura del certificado: %s\n"
+
+#: sm/certchain.c:919
+msgid "signature not created during lifetime of certificate"
 msgstr ""
-"No se ha encontrado ning�n certificado sin valor de confianza.\n"
-"\n"
 
-#: sm/certchain.c:975
+#: sm/certchain.c:921
+msgid "certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:922
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:926
+#, fuzzy
+msgid "  (  signature created at "
+msgstr "firmas creadas hasta ahora: %lu\n"
+
+#: sm/certchain.c:927
+#, fuzzy
+msgid "  (certificate created at "
+msgstr "Certificado de revocaci�n creado.\n"
+
+#: sm/certchain.c:930
+#, fuzzy
+msgid "  (certificate valid from "
+msgstr "Revocaci�n de certificado v�lida"
+
+#: sm/certchain.c:931
+#, fuzzy
+msgid "  (     issuer valid from "
+msgstr "      N�mero de serie de la tarjeta ="
+
+#: sm/certchain.c:961
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Huella dactilar CA:"
 
-#: sm/certchain.c:983
+#: sm/certchain.c:970
 #, fuzzy
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 "No se ha encontrado ning�n certificado sin valor de confianza.\n"
 "\n"
 
-#: sm/certchain.c:998
+#: sm/certchain.c:983
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1004
+#: sm/certchain.c:989
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1046
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr ""
+
+#: sm/certchain.c:1110
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "Certificado correcto"
+
+#: sm/certchain.c:1184
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:1253
+#, fuzzy
+msgid "root certificate is not marked trusted"
+msgstr ""
+"No se ha encontrado ning�n certificado sin valor de confianza.\n"
+"\n"
+
+#: sm/certchain.c:1266
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "la comprobaci�n de la firma creada fall�: %s\n"
 
-#: sm/certchain.c:1041 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:157
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:1053
+#: sm/certchain.c:1307
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:1086
+#: sm/certchain.c:1340
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifica una firma"
 
-#: sm/certchain.c:1116
+#: sm/certchain.c:1371
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1167
+#: sm/certchain.c:1422
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
+#: sm/certchain.c:1462 sm/certchain.c:1730
+#, fuzzy
+msgid "certificate is good\n"
+msgstr "Revocaci�n de certificado v�lida"
+
+#: sm/certchain.c:1463
+#, fuzzy
+msgid "intermediate certificate is good\n"
+msgstr "certificado duplicado - eliminado"
+
+#: sm/certchain.c:1464
+#, fuzzy
+msgid "root certificate is good\n"
+msgstr ""
+"No se ha encontrado ning�n certificado sin valor de confianza.\n"
+"\n"
+
+#: sm/certchain.c:1620
+msgid "switching to chain model"
+msgstr ""
+
+#: sm/certchain.c:1629
+#, c-format
+msgid "validation model used: %s"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "chain model"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "shell model"
+msgstr ""
+
 #: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
@@ -6929,7 +7058,7 @@ msgstr "Error: respuesta no v�lida.\n"
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
 "\"%s\"\n"
-"S/N %s, ID %08lX, created %s"
+"S/N %s, ID 0x%08lX, created %s"
 msgstr ""
 "Necesita una frase contrase�a para desbloquear la clave secreta\n"
 "del usuario: \"%.*s\"\n"
@@ -6939,7 +7068,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:131 sm/keylist.c:255
+#: sm/certlist.c:131 sm/keylist.c:258
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "error obteniendo la informaci�n actual de la clave: %s\n"
@@ -7061,125 +7190,125 @@ msgstr "error creando frase contrase�a: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[file]|crea una firma"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[file]|crea una firma en texto claro"
 
-#: sm/gpgsm.c:251
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list external keys"
 msgstr "lista claves secretas"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/gpgsm.c:256
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "elimina claves del anillo p�blico"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:262
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 #, fuzzy
 msgid "register a smartcard"
 msgstr "a�adir clave a tarjeta"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:268
 #, fuzzy
 msgid "change a passphrase"
 msgstr "cambia la frase contrase�a"
 
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crea una salida ascii con armadura"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:287
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:296
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:302
+#: sm/gpgsm.c:304
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:305
+#: sm/gpgsm.c:309
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:312
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:315
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:319
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:323
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:325
 msgid "use the default key as default recipient"
 msgstr "usa la clave por defecto como destinatario"
 
-#: sm/gpgsm.c:338
+#: sm/gpgsm.c:342
 msgid "don't use the terminal at all"
 msgstr "no usa la terminal en absoluto"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:346
 msgid "force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:347
 msgid "always use a MDC for encryption"
 msgstr "siempre usa un MDC para cifrar"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:352
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
@@ -7189,60 +7318,60 @@ msgstr "proceso por lotes: nunca preguntar"
 # Adem�s una de las acepciones de asumir es "aceptar algo" y suponer
 # viene a ser asumir una idea como propia. Suponer "s�" en casi todas las
 # preguntas no me acaba de gustar.
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:353
 msgid "assume yes on most questions"
 msgstr "asume \"s�\" en casi todas las preguntas"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:354
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:356
 msgid "add this keyring to the list of keyrings"
 msgstr "a�ade este anillo a la lista de anillos"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:357
 msgid "add this secret keyring to the list"
 msgstr "a�ade este anillo secreto a la lista"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:359
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVIDOR|usa este servidor de claves"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:360
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:364
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:375
+#: sm/gpgsm.c:379
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
 
-#: sm/gpgsm.c:381
+#: sm/gpgsm.c:385
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:387
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:389
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa el algoritmo de compresi�n N"
 
-#: sm/gpgsm.c:522
+#: sm/gpgsm.c:528
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpgm [opciones] [ficheros] (-h para ayuda)"
 
-#: sm/gpgsm.c:525
+#: sm/gpgsm.c:531
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7253,31 +7382,36 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: sm/gpgsm.c:604
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpgm [opciones] "
 
-#: sm/gpgsm.c:685
+#: sm/gpgsm.c:691
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "no se puede conectar con `%s': %s\n"
 
-#: sm/gpgsm.c:1237
+#: sm/gpgsm.c:713
+#, fuzzy, c-format
+msgid "unknown validation model `%s'\n"
+msgstr "opci�n desconocida `%s'\n"
+
+#: sm/gpgsm.c:1264
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1316
+#: sm/gpgsm.c:1344
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1334
+#: sm/gpgsm.c:1362
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "no se puede acceder a `%s': %s\n"
 
-#: sm/gpgsm.c:1529
+#: sm/gpgsm.c:1543
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7300,7 +7434,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "error obteniendo el n�mero de serie: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:375
+#: sm/import.c:541 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "error leyendo `%s': %s\n"
@@ -7384,7 +7518,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234
+#: sm/qualified.c:234 sm/verify.c:536
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7403,30 +7537,35 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "la comprobaci�n de la firma creada fall�: %s\n"
 
-#: sm/verify.c:386
+#: sm/verify.c:388
 #, fuzzy
 msgid "Signature made "
 msgstr "Firmado el %s\n"
 
-#: sm/verify.c:390
+#: sm/verify.c:392
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:391
-#, c-format
-msgid " using certificate ID %08lX\n"
-msgstr ""
+#: sm/verify.c:393
+#, fuzzy, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr "error obteniendo el n�mero de serie: %s\n"
 
-#: sm/verify.c:507
+#: sm/verify.c:514
 #, fuzzy
 msgid "Good signature from"
 msgstr "Firma correcta de \"%s\""
 
-#: sm/verify.c:508
+#: sm/verify.c:515
 #, fuzzy
 msgid "                aka"
 msgstr "                alias \"%s\""
 
+#: sm/verify.c:533
+#, fuzzy
+msgid "This is a qualified signature\n"
+msgstr "Esto ser� una autofirma.\n"
+
 #: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
@@ -7463,133 +7602,138 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:315
+#: tools/gpg-connect-agent.c:314
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:323
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:382
+#: tools/gpg-connect-agent.c:381
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "l�nea demasiado larga"
 
-#: tools/gpg-connect-agent.c:386
+#: tools/gpg-connect-agent.c:385
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:458
+#: tools/gpg-connect-agent.c:457
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "opci�n desconocida `%s'\n"
 
-#: tools/gpg-connect-agent.c:466
+#: tools/gpg-connect-agent.c:465
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "firma fallida: %s\n"
 
-#: tools/gpg-connect-agent.c:474
+#: tools/gpg-connect-agent.c:473
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "fallo leyendo la clave\n"
 
-#: tools/gpg-connect-agent.c:784
+#: tools/gpg-connect-agent.c:789
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "error enviando a `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:793
+#: tools/gpg-connect-agent.c:798
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "error enviando a `%s': %s\n"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
+#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
-#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
+#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "habilita depuraci�n completa"
 
-#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
-#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:501
+#: tools/gpgconf-comp.c:492
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:505
+#: tools/gpgconf-comp.c:496
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:509
+#: tools/gpgconf-comp.c:500
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:510
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:638
+#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#, fuzzy
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NOMBRE|cifra para NOMBRE"
+
+#: tools/gpgconf-comp.c:635
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:640
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las contrase�as"
 
-#: tools/gpgconf-comp.c:705
+#: tools/gpgconf-comp.c:708
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:749
+#: tools/gpgconf-comp.c:752
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:785
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:806
+#: tools/gpgconf-comp.c:809
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:814
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:848
+#: tools/gpgconf-comp.c:851
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2681
+#: tools/gpgconf-comp.c:2684
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8423,9 +8567,6 @@ msgstr "el resumen protector %d no puede ser utilizado\n"
 #~ msgid "save"
 #~ msgstr "graba"
 
-#~ msgid "help"
-#~ msgstr "ayuda"
-
 #~ msgid "fpr"
 #~ msgstr "hdac"
 
diff --git a/po/et.po b/po/et.po
index 0a3ffa7aa..dac701e74 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-07-05 18:01+0200\n"
+"POT-Creation-Date: 2007-08-10 15:49+0200\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -19,54 +19,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: agent/call-pinentry.c:426
+#: agent/call-pinentry.c:436
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:429
+#: agent/call-pinentry.c:439
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/call-pinentry.c:476
+#: agent/call-pinentry.c:486
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
+#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
 #, fuzzy
 msgid "PIN too long"
 msgstr "rida on liiga pikk\n"
 
-#: agent/call-pinentry.c:497
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "liiga pikk parool\n"
 
-#: agent/call-pinentry.c:505
+#: agent/call-pinentry.c:515
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Lubamatu s�mbol nimes\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:520
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:522
+#: agent/call-pinentry.c:532
 #, fuzzy
 msgid "Bad PIN"
 msgstr "halb MPI"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:533
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "halb parool"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:569
 #, fuzzy
 msgid "Passphrase"
 msgstr "halb parool"
@@ -83,14 +83,14 @@ msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 msgid "can't create `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
 #: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
-#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1796
+#: sm/gpgsm.c:1833 sm/gpgsm.c:1871 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
@@ -177,35 +177,46 @@ msgstr[1] ""
 msgid "Take this one anyway"
 msgstr "Kasutan seda v�tit ikka? "
 
-#: agent/genkey.c:99
+#: agent/genkey.c:99 agent/genkey.c:114
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Sisestage parool\n"
 
-#: agent/genkey.c:144
+#: agent/genkey.c:107
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+
+#: agent/genkey.c:113
+msgid "Yes, protection is not needed"
+msgstr ""
+
+#: agent/genkey.c:158
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
 "\n"
 
-#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
+#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muuda parooli"
 
-#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
 #: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:263
+#: agent/genkey.c:280
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muuda parooli"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -215,247 +226,247 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:103
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
-#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
 #: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
-#: sm/gpgsm.c:337
+#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "ole m�nev�rra vaiksem"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:109
+#: agent/gpg-agent.c:118 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:119
+#: agent/gpg-agent.c:125 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:125
+#: agent/gpg-agent.c:126
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "otsi v�tmeid v�tmeserverist"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:129
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "uuenda usalduse andmebaasi"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:145
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:206 sm/gpgsm.c:525 tools/gpg-connect-agent.c:124
 #: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Palun saatke veateated aadressil <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:262
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
+#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
-#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:340 sm/gpgsm.c:772 sm/gpgsm.c:775 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
+#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:863
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
-#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: scd/scdaemon.c:421 sm/gpgsm.c:867 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
+#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:874
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
-#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:921
+#: agent/gpg-agent.c:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
+#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:908
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
+#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
+#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
+#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
+#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: kataloog on loodud\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1377
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1381
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: kataloogi ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1497
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1519
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
+#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
+#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: j�tsin vahele: %s\n"
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1752
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:751
+#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
 
-#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
-#: tools/gpg-connect-agent.c:762
+#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
@@ -520,42 +531,42 @@ msgstr "viga parooli loomisel: %s\n"
 msgid "cancelled\n"
 msgstr "Katkesta"
 
-#: agent/trustlist.c:131 agent/trustlist.c:319
+#: agent/trustlist.c:132 agent/trustlist.c:322
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: agent/trustlist.c:146
+#: agent/trustlist.c:147
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: agent/trustlist.c:166 agent/trustlist.c:174
+#: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:180
+#: agent/trustlist.c:181
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "salajase v�tme komponendid ei ole k�ttesaadavad\n"
 
-#: agent/trustlist.c:215
+#: agent/trustlist.c:216
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "viga lugemisel: %s\n"
 
-#: agent/trustlist.c:241 agent/trustlist.c:248
+#: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:280
+#: agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: agent/trustlist.c:381 agent/trustlist.c:420
+#: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -568,7 +579,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:496
+#: agent/trustlist.c:507
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -578,7 +589,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:505
+#: agent/trustlist.c:516
 msgid "Correct"
 msgstr ""
 
@@ -590,58 +601,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:525
+#: agent/trustlist.c:536
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 #, fuzzy
 msgid "Yes"
 msgstr "jah"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:393
+#: common/exechelp.c:302 common/exechelp.c:390
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: common/exechelp.c:369 common/exechelp.c:426
+#: common/exechelp.c:366 common/exechelp.c:423
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "faili ei �nnestu avada: %s\n"
 
-#: common/exechelp.c:405 common/exechelp.c:635
+#: common/exechelp.c:402 common/exechelp.c:632
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: common/exechelp.c:461 common/exechelp.c:504
+#: common/exechelp.c:458 common/exechelp.c:501
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:469
+#: common/exechelp.c:466
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: common/exechelp.c:475 common/exechelp.c:515
+#: common/exechelp.c:472 common/exechelp.c:512
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: common/exechelp.c:510
+#: common/exechelp.c:507
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:521
+#: common/exechelp.c:518
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -660,26 +671,26 @@ msgstr "[Kasutaja id puudub]"
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: common/simple-pwquery.c:376
+#: common/simple-pwquery.c:373
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
 
-#: common/simple-pwquery.c:387
+#: common/simple-pwquery.c:384
 msgid "communication problem with gpg-agent\n"
 msgstr "probleem gpg-agent programmiga suhtlemisel\n"
 
-#: common/simple-pwquery.c:397
+#: common/simple-pwquery.c:394
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
-#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+#: common/simple-pwquery.c:557 common/simple-pwquery.c:653
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "katkestatud kasutaja poolt\n"
 
-#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+#: common/simple-pwquery.c:572 common/simple-pwquery.c:659
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
@@ -860,7 +871,7 @@ msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
 msgid "not human readable"
 msgstr "pole inimese poolt loetav"
 
-#: g10/card-util.c:62 g10/card-util.c:305
+#: g10/card-util.c:62 g10/card-util.c:308
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "salajane v�ti ei ole k�ttesaadav"
@@ -870,166 +881,166 @@ msgstr "salajane v�ti ei ole k�ttesaadav"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1391 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
 #: g10/keygen.c:1644
 msgid "Your selection? "
 msgstr "Teie valik? "
 
-#: g10/card-util.c:215 g10/card-util.c:265
+#: g10/card-util.c:218 g10/card-util.c:268
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:412
+#: g10/card-util.c:415
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 #, fuzzy
 msgid "unspecified"
 msgstr "P�hjus puudub"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 #, fuzzy
 msgid "not forced"
 msgstr "ei t��deldud"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:521
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:523
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:525
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:539
+#: g10/card-util.c:542
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:544
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:562
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:580
+#: g10/card-util.c:583
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "vastavat avalikku v�tit pole: %s\n"
 
-#: g10/card-util.c:588
+#: g10/card-util.c:591
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
+#: g10/card-util.c:689 g10/card-util.c:758 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/card-util.c:694
+#: g10/card-util.c:697
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:704
+#: g10/card-util.c:707
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:763
+#: g10/card-util.c:766
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:773
+#: g10/card-util.c:776
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:793
+#: g10/card-util.c:796
 #, fuzzy
 msgid "Language preferences: "
 msgstr "uuendatud eelistused"
 
-#: g10/card-util.c:801
+#: g10/card-util.c:804
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:813
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/card-util.c:831
+#: g10/card-util.c:834
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:845
+#: g10/card-util.c:848
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: g10/card-util.c:866
+#: g10/card-util.c:869
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "n�ita s�rmej�lge"
 
-#: g10/card-util.c:889
+#: g10/card-util.c:892
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: g10/card-util.c:937
+#: g10/card-util.c:940
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:941
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/card-util.c:947
+#: g10/card-util.c:950
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/card-util.c:1031
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1051 g10/card-util.c:1060
+#: g10/card-util.c:1054 g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1075
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1084
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1037,136 +1048,136 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1115
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
 
-#: g10/card-util.c:1117 g10/card-util.c:1194
+#: g10/card-util.c:1120 g10/card-util.c:1197
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/card-util.c:1118 g10/card-util.c:1196
+#: g10/card-util.c:1121 g10/card-util.c:1199
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1198
+#: g10/card-util.c:1122 g10/card-util.c:1201
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1135 g10/card-util.c:1214 g10/keyedit.c:945
+#: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
 #: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
-#: g10/card-util.c:1191
+#: g10/card-util.c:1194
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Palun valige t�histamise p�hjus:\n"
 
-#: g10/card-util.c:1226
+#: g10/card-util.c:1229
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "tundmatu kaitsealgoritm\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1234
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1239
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/card-util.c:1304 g10/keyedit.c:1362
+#: g10/card-util.c:1307 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "v�lju sellest men��st"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1309
 #, fuzzy
 msgid "show admin commands"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1307 g10/keyedit.c:1365
+#: g10/card-util.c:1310 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "n�ita seda abiinfot"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1312
 #, fuzzy
 msgid "list all available data"
 msgstr "V�tme leiate: "
 
-#: g10/card-util.c:1312
+#: g10/card-util.c:1315
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1313
+#: g10/card-util.c:1316
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1317
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1315
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "change the login name"
 msgstr "muuda aegumise kuup�eva"
 
-#: g10/card-util.c:1316
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuda omaniku usaldust"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1320
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1322
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1323
 #, fuzzy
 msgid "generate new keys"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1324
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1325
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442 g10/keyedit.c:1634
+#: g10/card-util.c:1445 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "K�sklus> "
 
-#: g10/card-util.c:1480
+#: g10/card-util.c:1483
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1511
+#: g10/card-util.c:1514
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1513
+#: g10/card-util.c:1516
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/card-util.c:1587 g10/keyedit.c:2255
+#: g10/card-util.c:1590 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane k�sklus (proovige \"help\")\n"
 
@@ -1174,7 +1185,7 @@ msgstr "Vigane k�sklus (proovige \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "v�ti --output ei t��ta selle k�suga\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' ei �nnestu avada\n"
@@ -1484,7 +1495,7 @@ msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
 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/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1500,27 +1511,27 @@ msgstr "|[fail]|loo allkiri"
 msgid "|[file]|make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: g10/gpg.c:372 sm/gpgsm.c:244
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "kr�pteeri andmed"
 
-#: g10/gpg.c:375 sm/gpgsm.c:246
+#: g10/gpg.c:375 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
 
-#: g10/gpg.c:377 sm/gpgsm.c:247
+#: g10/gpg.c:377 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "dekr�pteeri andmed (vaikimisi)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:248
+#: g10/gpg.c:379 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/gpg.c:381 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "n�ita v�tmeid"
 
@@ -1533,11 +1544,11 @@ msgstr "n�ita v�tmeid ja allkirju"
 msgid "list and check key signatures"
 msgstr "kontrolli v�tmete allkirju"
 
-#: g10/gpg.c:385 sm/gpgsm.c:254
+#: g10/gpg.c:385 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "n�ita v�tmeid ja s�rmej�lgi"
 
-#: g10/gpg.c:386 sm/gpgsm.c:252
+#: g10/gpg.c:386 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "n�ita salajasi v�tmeid"
 
@@ -1573,11 +1584,11 @@ msgstr "genereeri t�histamise sertifikaat"
 msgid "export keys"
 msgstr "ekspordi v�tmed"
 
-#: g10/gpg.c:397 sm/gpgsm.c:257
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "ekspordi v�tmed v�tmeserverisse"
 
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "impordi v�tmed v�tmeserverist"
 
@@ -1613,11 +1624,11 @@ msgstr "uuenda usalduse andmebaasi"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [failid]|tr�ki teatel�hendid"
 
-#: g10/gpg.c:430 sm/gpgsm.c:262
+#: g10/gpg.c:430 sm/gpgsm.c:264
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
 #: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1628,31 +1639,31 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:279
+#: g10/gpg.c:434 sm/gpgsm.c:281
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: g10/gpg.c:436 sm/gpgsm.c:291
+#: g10/gpg.c:436 sm/gpgsm.c:293
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|kr�pti NIMEle"
 
-#: g10/gpg.c:447 sm/gpgsm.c:327
+#: g10/gpg.c:447 sm/gpgsm.c:331
 msgid "use this user-id to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
 
-#: g10/gpg.c:448 sm/gpgsm.c:330
+#: g10/gpg.c:448 sm/gpgsm.c:334
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:332
+#: g10/gpg.c:453 sm/gpgsm.c:336
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "kasuta v�ljundfailina"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "�ra tee mingeid muutusi"
 
@@ -1668,7 +1679,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:393
+#: g10/gpg.c:553 sm/gpgsm.c:397
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1676,7 +1687,7 @@ msgstr ""
 "@\n"
 "(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:396
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1714,7 +1725,7 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:532
+#: g10/gpg.c:781 sm/gpgsm.c:538
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1742,7 +1753,7 @@ msgstr "Pakkimine: "
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:669
+#: g10/gpg.c:1045 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "vastuolulised k�sud\n"
 
@@ -1818,461 +1829,461 @@ msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1552
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1562
+#: 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:1564
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1827
+#: g10/gpg.c:1825
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1981
 #, 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:2243 g10/gpg.c:2884 g10/gpg.c:2896
+#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
 
-#: g10/gpg.c:2401 g10/gpg.c:2413
+#: g10/gpg.c:2399 g10/gpg.c:2411
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2493
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4084
+#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2528
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2531
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2538
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2541
 msgid "invalid import options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2548
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2551
 msgid "invalid export options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2558
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2561
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2569
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2571
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2573
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2575
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2579
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2581
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2585
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2587
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2589
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2591
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2598
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2608
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2782
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2787
+#: g10/gpg.c:2785
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2873 sm/gpgsm.c:1220
+#: g10/gpg.c:2871 sm/gpgsm.c:1247
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2875
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2884
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2887
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2902
 #, 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:2918
+#: g10/gpg.c:2916
 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:2924
+#: g10/gpg.c:2922
 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:2930
+#: g10/gpg.c:2928
 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:2943
+#: g10/gpg.c:2941
 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:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
+#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1303
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
+#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1311
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3025
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3040
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3042
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3044
 #, 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:3048
+#: g10/gpg.c:3046
 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:3050
+#: g10/gpg.c:3048
 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:3053
+#: g10/gpg.c:3051
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/gpg.c:3057
+#: g10/gpg.c:3055
 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:3064
+#: g10/gpg.c:3062
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3071
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku �ifri eelistused\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3075
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku l�hendi eelistused\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3079
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/gpg.c:3114
+#: g10/gpg.c:3112
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei t��ta veel koos %s-ga\n"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3159
 #, 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:3166
+#: g10/gpg.c:3164
 #, 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:3171
+#: g10/gpg.c:3169
 #, 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:3263
+#: g10/gpg.c:3261
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3272
 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:3295
+#: g10/gpg.c:3293
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3300
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3302
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3312
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3325
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3327
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3332
+#: g10/gpg.c:3330
 #, 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:3350
+#: g10/gpg.c:3348
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3361
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3376
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3378
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3381
 #, 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:3403
+#: g10/gpg.c:3401
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3410
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3435
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3443
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3447
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3468
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3553
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3557
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "v�tme eksport eba�nnestus: %s\n"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3568
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
 
-#: g10/gpg.c:3580
+#: g10/gpg.c:3578
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3631
+#: g10/gpg.c:3629
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3639
+#: g10/gpg.c:3637
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3729
+#: g10/gpg.c:3727
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane r�sialgoritm `%s'\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3844
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/gpg.c:3850
+#: g10/gpg.c:3848
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4160
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4162
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4195
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
@@ -2285,7 +2296,7 @@ msgstr "v�ta v�tmed sellest v�tmehoidlast"
 msgid "make timestamp conflicts only a warning"
 msgstr "teata ajatemplite konfliktist ainult hoiatusega"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:368
+#: g10/gpgv.c:75 sm/gpgsm.c:372
 msgid "|FD|write status info to this FD"
 msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
 
@@ -6700,64 +6711,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: scd/scdaemon.c:105
+#: scd/scdaemon.c:108
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:357
+#: scd/scdaemon.c:114 sm/gpgsm.c:361
 #, fuzzy
 msgid "read options from file"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:124
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:129
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "�ra kasuta terminali"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:134
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:135
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "vastuolulised k�sud\n"
 
-#: scd/scdaemon.c:206
+#: scd/scdaemon.c:209
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: scd/scdaemon.c:208
+#: scd/scdaemon.c:211
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:671
+#: scd/scdaemon.c:658
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1019
+#: scd/scdaemon.c:1006
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1024
+#: scd/scdaemon.c:1011
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6786,143 +6797,257 @@ msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:174
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr ""
+
+#: sm/certchain.c:195
+msgid "chain"
+msgstr ""
+
+#: sm/certchain.c:196
+#, fuzzy
+msgid "shell"
+msgstr "help"
+
+#: sm/certchain.c:241
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
 
-#: sm/certchain.c:212
+#: sm/certchain.c:279
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:250
+#: sm/certchain.c:317
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:260
+#: sm/certchain.c:327
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
 
-#: sm/certchain.c:267 sm/certchain.c:296
+#: sm/certchain.c:334 sm/certchain.c:363
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:271 sm/certchain.c:300
+#: sm/certchain.c:338 sm/certchain.c:367
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: sm/certchain.c:411
+#: sm/certchain.c:478
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:431
+#: sm/certchain.c:498
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: sm/certchain.c:675
+#: sm/certchain.c:742
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "M�RKUS: v�ti on t�histatud"
 
-#: sm/certchain.c:684
+#: sm/certchain.c:752
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "halb sertifikaat"
 
-#: sm/certchain.c:688
+#: sm/certchain.c:757
+msgid "the status of the certificate is unknown"
+msgstr ""
+
+#: sm/certchain.c:762
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "V�tme leiate: "
 
-#: sm/certchain.c:690
+#: sm/certchain.c:764
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:695
+#: sm/certchain.c:770
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 
-#: sm/certchain.c:791
-#, fuzzy
-msgid "no issuer found in certificate"
-msgstr "genereeri t�histamise sertifikaat"
-
-#: sm/certchain.c:820
+#: sm/certchain.c:799 sm/certchain.c:867
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:836
+#: sm/certchain.c:814 sm/certchain.c:899
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:849
+#: sm/certchain.c:815 sm/certchain.c:900
+#, fuzzy
+msgid "root certificate not yet valid"
+msgstr "kirjutan salajase v�tme faili `%s'\n"
+
+#: sm/certchain.c:816 sm/certchain.c:901
+msgid "intermediate certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:829
 #, fuzzy
 msgid "certificate has expired"
 msgstr "See v�ti on aegunud!"
 
-#: sm/certchain.c:892
-msgid "self-signed certificate has a BAD signature"
+#: sm/certchain.c:830
+#, fuzzy
+msgid "root certificate has expired"
+msgstr "See v�ti on aegunud!"
+
+#: sm/certchain.c:831
+#, fuzzy
+msgid "intermediate certificate has expired"
+msgstr "See v�ti on aegunud!"
+
+#: sm/certchain.c:873
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:960
-msgid "root certificate is not marked trusted"
+#: sm/certchain.c:882
+#, fuzzy
+msgid "certificate with invalid validity"
+msgstr "See v�ti on aegunud!"
+
+#: sm/certchain.c:919
+msgid "signature not created during lifetime of certificate"
+msgstr ""
+
+#: sm/certchain.c:921
+msgid "certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:922
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:926
+#, fuzzy
+msgid "  (  signature created at "
+msgstr "         uusi allkirju: %lu\n"
+
+#: sm/certchain.c:927
+#, fuzzy
+msgid "  (certificate created at "
+msgstr "T�histamise sertifikaat on loodud.\n"
+
+#: sm/certchain.c:930
+#, fuzzy
+msgid "  (certificate valid from "
+msgstr "halb sertifikaat"
+
+#: sm/certchain.c:931
+msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:975
+#: sm/certchain.c:961
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "n�ita s�rmej�lge"
 
-#: sm/certchain.c:983
+#: sm/certchain.c:970
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:998
+#: sm/certchain.c:983
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1004
+#: sm/certchain.c:989
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1046
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr ""
+
+#: sm/certchain.c:1110
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "genereeri t�histamise sertifikaat"
+
+#: sm/certchain.c:1184
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:1253
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:1266
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 
-#: sm/certchain.c:1041 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1053
+#: sm/certchain.c:1307
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1086
+#: sm/certchain.c:1340
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "kontrolli allkirja"
 
-#: sm/certchain.c:1116
+#: sm/certchain.c:1371
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1167
+#: sm/certchain.c:1422
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
+#: sm/certchain.c:1462 sm/certchain.c:1730
+#, fuzzy
+msgid "certificate is good\n"
+msgstr "eelistus %c%lu on duplikaat\n"
+
+#: sm/certchain.c:1463
+#, fuzzy
+msgid "intermediate certificate is good\n"
+msgstr "T�histamise sertifikaat on loodud.\n"
+
+#: sm/certchain.c:1464
+#, fuzzy
+msgid "root certificate is good\n"
+msgstr "halb sertifikaat"
+
+#: sm/certchain.c:1620
+msgid "switching to chain model"
+msgstr ""
+
+#: sm/certchain.c:1629
+#, c-format
+msgid "validation model used: %s"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "chain model"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "shell model"
+msgstr ""
+
 #: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
@@ -6970,7 +7095,7 @@ msgstr "viga: vigane s�rmej�lg\n"
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
 "\"%s\"\n"
-"S/N %s, ID %08lX, created %s"
+"S/N %s, ID 0x%08lX, created %s"
 msgstr ""
 "Te vajate kasutaja salajase v�tme lahtilukustamiseks parooli:\n"
 "\"%.*s\"\n"
@@ -6980,7 +7105,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:131 sm/keylist.c:255
+#: sm/certlist.c:131 sm/keylist.c:258
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
@@ -7102,181 +7227,181 @@ msgstr "viga parooli loomisel: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[fail]|loo allkiri"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: sm/gpgsm.c:251
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list external keys"
 msgstr "n�ita salajasi v�tmeid"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list certificate chain"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:256
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "eemalda v�tmed avalike v�tmete hoidlast"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "import certificates"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:262
 #, fuzzy
 msgid "export certificates"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:268
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muuda parooli"
 
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:287
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:296
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:302
+#: sm/gpgsm.c:304
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:305
+#: sm/gpgsm.c:309
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:312
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:315
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:319
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:323
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:325
 msgid "use the default key as default recipient"
 msgstr "kasuta vaikimisi saajana vaikimisi v�tit"
 
-#: sm/gpgsm.c:338
+#: sm/gpgsm.c:342
 msgid "don't use the terminal at all"
 msgstr "�ra kasuta terminali"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:346
 msgid "force v3 signatures"
 msgstr "kasuta v3 allkirju"
 
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:347
 msgid "always use a MDC for encryption"
 msgstr "kr�ptimisel kasuta alati MDC"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:352
 msgid "batch mode: never ask"
 msgstr "pakettmood: �ra k�si kunagi"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:353
 msgid "assume yes on most questions"
 msgstr "eelda enamus k�simustele jah vastust"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:354
 msgid "assume no on most questions"
 msgstr "eelda enamus k�simustele ei vastust"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:356
 msgid "add this keyring to the list of keyrings"
 msgstr "lisa see v�tmehoidla v�tmehoidlate nimekirja"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:357
 msgid "add this secret keyring to the list"
 msgstr "lisa see salajaste v�tmete hoidla nimekirja"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:359
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|kasuta seda v�tmeserverit"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:360
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NIMI|terminali kooditabel on NIMI"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:364
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:375
+#: sm/gpgsm.c:379
 msgid "|FILE|load extension module FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: sm/gpgsm.c:381
+#: sm/gpgsm.c:385
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI|kasuta �ifri algoritmi NIMI"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:387
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|kasuta teatel�hendi algoritmi NIMI"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:389
 msgid "|N|use compress algorithm N"
 msgstr "|N|kasuta pakkimisalgoritmi N"
 
-#: sm/gpgsm.c:522
+#: sm/gpgsm.c:528
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: sm/gpgsm.c:525
+#: sm/gpgsm.c:531
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7287,31 +7412,36 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: sm/gpgsm.c:604
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: sm/gpgsm.c:685
+#: sm/gpgsm.c:691
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
 
-#: sm/gpgsm.c:1237
+#: sm/gpgsm.c:713
+#, fuzzy, c-format
+msgid "unknown validation model `%s'\n"
+msgstr "tundmatu vaikimisi saaja `%s'\n"
+
+#: sm/gpgsm.c:1264
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1316
+#: sm/gpgsm.c:1344
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: sm/gpgsm.c:1334
+#: sm/gpgsm.c:1362
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "`%s' ei �nnestu sulgeda: %s\n"
 
-#: sm/gpgsm.c:1529
+#: sm/gpgsm.c:1543
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7334,7 +7464,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:375
+#: sm/import.c:541 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -7418,7 +7548,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234
+#: sm/qualified.c:234 sm/verify.c:536
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7437,30 +7567,37 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 
-#: sm/verify.c:386
+#: sm/verify.c:388
 #, fuzzy
 msgid "Signature made "
 msgstr "Allkiri aegus %s\n"
 
-#: sm/verify.c:390
+#: sm/verify.c:392
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:391
-#, c-format
-msgid " using certificate ID %08lX\n"
-msgstr ""
+#: sm/verify.c:393
+#, fuzzy, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr "viga parooli loomisel: %s\n"
 
-#: sm/verify.c:507
+#: sm/verify.c:514
 #, fuzzy
 msgid "Good signature from"
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: sm/verify.c:508
+#: sm/verify.c:515
 #, fuzzy
 msgid "                aka"
 msgstr "                 ka \""
 
+#: sm/verify.c:533
+#, fuzzy
+msgid "This is a qualified signature\n"
+msgstr ""
+"\n"
+"See saab olema iseenda allkiri.\n"
+
 #: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
@@ -7497,132 +7634,137 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:315
+#: tools/gpg-connect-agent.c:314
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:323
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:382
+#: tools/gpg-connect-agent.c:381
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "rida on liiga pikk\n"
 
-#: tools/gpg-connect-agent.c:386
+#: tools/gpg-connect-agent.c:385
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:458
+#: tools/gpg-connect-agent.c:457
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: tools/gpg-connect-agent.c:466
+#: tools/gpg-connect-agent.c:465
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "allkirjastamine eba�nnestus: %s\n"
 
-#: tools/gpg-connect-agent.c:474
+#: tools/gpg-connect-agent.c:473
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: tools/gpg-connect-agent.c:784
+#: tools/gpg-connect-agent.c:789
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:793
+#: tools/gpg-connect-agent.c:798
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
+#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
-#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
+#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
-#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:501
+#: tools/gpgconf-comp.c:492
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:505
+#: tools/gpgconf-comp.c:496
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:509
+#: tools/gpgconf-comp.c:500
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:510
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:638
+#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#, fuzzy
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NIMI|kr�pti NIMEle"
+
+#: tools/gpgconf-comp.c:635
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:640
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NIMI|kasuta paroolidega �ifri algoritmi NIMI"
 
-#: tools/gpgconf-comp.c:705
+#: tools/gpgconf-comp.c:708
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:749
+#: tools/gpgconf-comp.c:752
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:785
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:806
+#: tools/gpgconf-comp.c:809
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:814
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:848
+#: tools/gpgconf-comp.c:851
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2681
+#: tools/gpgconf-comp.c:2684
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8237,9 +8379,6 @@ msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 #~ msgid "q"
 #~ msgstr "v"
 
-#~ msgid "help"
-#~ msgstr "help"
-
 #~ msgid "list"
 #~ msgstr "list"
 
diff --git a/po/fi.po b/po/fi.po
index 7600c5399..479cb4f75 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-07-05 18:01+0200\n"
+"POT-Creation-Date: 2007-08-10 15:49+0200\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -35,54 +35,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: agent/call-pinentry.c:426
+#: agent/call-pinentry.c:436
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:429
+#: agent/call-pinentry.c:439
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/call-pinentry.c:476
+#: agent/call-pinentry.c:486
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
+#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
 #, fuzzy
 msgid "PIN too long"
 msgstr "rivi on liian pitkä\n"
 
-#: agent/call-pinentry.c:497
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "salasana on liian pitkä\n"
 
-#: agent/call-pinentry.c:505
+#: agent/call-pinentry.c:515
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:520
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:522
+#: agent/call-pinentry.c:532
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI ei kelpaa"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:533
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "väärä salasana"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:569
 #, fuzzy
 msgid "Passphrase"
 msgstr "väärä salasana"
@@ -99,14 +99,14 @@ msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 msgid "can't create `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
 #: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
-#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1796
+#: sm/gpgsm.c:1833 sm/gpgsm.c:1871 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
@@ -193,35 +193,46 @@ msgstr[1] ""
 msgid "Take this one anyway"
 msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
 
-#: agent/genkey.c:99
+#: agent/genkey.c:99 agent/genkey.c:114
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Syötä salasana\n"
 
-#: agent/genkey.c:144
+#: agent/genkey.c:107
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+
+#: agent/genkey.c:113
+msgid "Yes, protection is not needed"
+msgstr ""
+
+#: agent/genkey.c:158
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Tarvitset salasanan suojaamaan salaista avaintasi.\n"
 "\n"
 
-#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
+#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
 #: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:263
+#: agent/genkey.c:280
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -231,248 +242,248 @@ msgstr ""
 "Valitsimet:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:103
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
-#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
 #: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "monisanainen"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
-#: sm/gpgsm.c:337
+#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "ole jonkinverran hiljaisempi"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:109
+#: agent/gpg-agent.c:118 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:119
+#: agent/gpg-agent.c:125 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:125
+#: agent/gpg-agent.c:126
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "etsi avaimia avainpalvelimelta"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:129
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "päivitä luottamustietokanta"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:145
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:206 sm/gpgsm.c:525 tools/gpg-connect-agent.c:124
 #: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:262
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
+#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
-#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:340 sm/gpgsm.c:772 sm/gpgsm.c:775 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
+#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:863
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
-#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
-#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: scd/scdaemon.c:421 sm/gpgsm.c:867 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
+#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:874
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
-#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:921
+#: agent/gpg-agent.c:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
+#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:908
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
+#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
+#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
+#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
+#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: hakemisto luotu\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1377
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1381
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: hakemistoa ei voi luoda: %s\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1497
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1519
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
+#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
+#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ohitettu: %s\n"
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1752
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:751
+#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
 
-#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
-#: tools/gpg-connect-agent.c:762
+#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
@@ -537,42 +548,42 @@ msgstr "virhe luotaessa salasanaa: %s\n"
 msgid "cancelled\n"
 msgstr "Peru"
 
-#: agent/trustlist.c:131 agent/trustlist.c:319
+#: agent/trustlist.c:132 agent/trustlist.c:322
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/trustlist.c:146
+#: agent/trustlist.c:147
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: agent/trustlist.c:166 agent/trustlist.c:174
+#: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:180
+#: agent/trustlist.c:181
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
 
-#: agent/trustlist.c:215
+#: agent/trustlist.c:216
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "lukuvirhe: %s\n"
 
-#: agent/trustlist.c:241 agent/trustlist.c:248
+#: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:280
+#: agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/trustlist.c:381 agent/trustlist.c:420
+#: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -585,7 +596,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:496
+#: agent/trustlist.c:507
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -595,7 +606,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:505
+#: agent/trustlist.c:516
 msgid "Correct"
 msgstr ""
 
@@ -607,58 +618,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:525
+#: agent/trustlist.c:536
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 #, fuzzy
 msgid "Yes"
 msgstr "kyllä|kylla|joo"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:393
+#: common/exechelp.c:302 common/exechelp.c:390
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: common/exechelp.c:369 common/exechelp.c:426
+#: common/exechelp.c:366 common/exechelp.c:423
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: common/exechelp.c:405 common/exechelp.c:635
+#: common/exechelp.c:402 common/exechelp.c:632
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: common/exechelp.c:461 common/exechelp.c:504
+#: common/exechelp.c:458 common/exechelp.c:501
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:469
+#: common/exechelp.c:466
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: common/exechelp.c:475 common/exechelp.c:515
+#: common/exechelp.c:472 common/exechelp.c:512
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: common/exechelp.c:510
+#: common/exechelp.c:507
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:521
+#: common/exechelp.c:518
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -677,26 +688,26 @@ msgstr "[Käyttäjätunnusta ei löytynyt]"
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: common/simple-pwquery.c:376
+#: common/simple-pwquery.c:373
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
 
-#: common/simple-pwquery.c:387
+#: common/simple-pwquery.c:384
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agentin kanssa yhteysongelma\n"
 
-#: common/simple-pwquery.c:397
+#: common/simple-pwquery.c:394
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
 
-#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+#: common/simple-pwquery.c:557 common/simple-pwquery.c:653
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "käyttäjän peruma\n"
 
-#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+#: common/simple-pwquery.c:572 common/simple-pwquery.c:659
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
@@ -879,7 +890,7 @@ msgstr "VAROITUS: löydettiin väärin muotoiltua notaatiodataa\n"
 msgid "not human readable"
 msgstr "ei ihmisten luettavissa"
 
-#: g10/card-util.c:62 g10/card-util.c:305
+#: g10/card-util.c:62 g10/card-util.c:308
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "salaista avainta ei löydy"
@@ -889,166 +900,166 @@ msgstr "salaista avainta ei löydy"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1391 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tätä ei voi tehdä eräajossa\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
 #: g10/keygen.c:1644
 msgid "Your selection? "
 msgstr "Valintasi? "
 
-#: g10/card-util.c:215 g10/card-util.c:265
+#: g10/card-util.c:218 g10/card-util.c:268
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:412
+#: g10/card-util.c:415
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 #, fuzzy
 msgid "unspecified"
 msgstr "Ei eriteltyä syytä"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 #, fuzzy
 msgid "not forced"
 msgstr "ei käsitelty"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:521
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:523
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:525
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:539
+#: g10/card-util.c:542
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:544
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:562
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:580
+#: g10/card-util.c:583
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "ei vastaavaa julkista avainta: %s\n"
 
-#: g10/card-util.c:588
+#: g10/card-util.c:591
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
+#: g10/card-util.c:689 g10/card-util.c:758 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: g10/card-util.c:694
+#: g10/card-util.c:697
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:704
+#: g10/card-util.c:707
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:763
+#: g10/card-util.c:766
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:773
+#: g10/card-util.c:776
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:793
+#: g10/card-util.c:796
 #, fuzzy
 msgid "Language preferences: "
 msgstr "päivitä valinnat"
 
-#: g10/card-util.c:801
+#: g10/card-util.c:804
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:813
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:831
+#: g10/card-util.c:834
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:845
+#: g10/card-util.c:848
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:866
+#: g10/card-util.c:869
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:889
+#: g10/card-util.c:892
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:937
+#: g10/card-util.c:940
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:941
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/card-util.c:947
+#: g10/card-util.c:950
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/card-util.c:1031
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1051 g10/card-util.c:1060
+#: g10/card-util.c:1054 g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1075
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1084
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1056,136 +1067,136 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1115
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/card-util.c:1117 g10/card-util.c:1194
+#: g10/card-util.c:1120 g10/card-util.c:1197
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/card-util.c:1118 g10/card-util.c:1196
+#: g10/card-util.c:1121 g10/card-util.c:1199
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1198
+#: g10/card-util.c:1122 g10/card-util.c:1201
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1135 g10/card-util.c:1214 g10/keyedit.c:945
+#: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
 #: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Valinta ei kelpaa.\n"
 
-#: g10/card-util.c:1191
+#: g10/card-util.c:1194
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: g10/card-util.c:1226
+#: g10/card-util.c:1229
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "tuntematon suojausalgoritmi\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1234
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1239
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/card-util.c:1304 g10/keyedit.c:1362
+#: g10/card-util.c:1307 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "ulos tästä valikosta"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1309
 #, fuzzy
 msgid "show admin commands"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1307 g10/keyedit.c:1365
+#: g10/card-util.c:1310 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "näytä tämä ohje"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1312
 #, fuzzy
 msgid "list all available data"
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/card-util.c:1312
+#: g10/card-util.c:1315
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1313
+#: g10/card-util.c:1316
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1317
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1315
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "change the login name"
 msgstr "muuta voimassoloaikaa"
 
-#: g10/card-util.c:1316
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuta luottamusastetta"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1320
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1322
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1323
 #, fuzzy
 msgid "generate new keys"
 msgstr "luo uusi avainpari"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1324
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1325
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442 g10/keyedit.c:1634
+#: g10/card-util.c:1445 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Komento> "
 
-#: g10/card-util.c:1480
+#: g10/card-util.c:1483
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1511
+#: g10/card-util.c:1514
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1513
+#: g10/card-util.c:1516
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/card-util.c:1587 g10/keyedit.c:2255
+#: g10/card-util.c:1590 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 
@@ -1193,7 +1204,7 @@ msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
@@ -1503,7 +1514,7 @@ msgstr ""
 "avain %08lX: salaisella avaimella ei ole vastaavaa \n"
 "julkista avainta - ohitetaan\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1519,27 +1530,27 @@ msgstr "|[tiedosto]|tee allekirjoitus"
 msgid "|[file]|make a clear text signature"
 msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
 
-#: g10/gpg.c:372 sm/gpgsm.c:244
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "tee erillinen allekirjoitus"
 
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "salaa tiedot"
 
-#: g10/gpg.c:375 sm/gpgsm.c:246
+#: g10/gpg.c:375 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "salaa vain symmetrisellä salaimella"
 
-#: g10/gpg.c:377 sm/gpgsm.c:247
+#: g10/gpg.c:377 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "avaa tiedot (oletus)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:248
+#: g10/gpg.c:379 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "tarkista allekirjoitus"
 
-#: g10/gpg.c:381 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "näytä avaimet"
 
@@ -1552,11 +1563,11 @@ msgstr "näytä avaimet allekirjoituksineen"
 msgid "list and check key signatures"
 msgstr "tarkista avainten allekirjoitukset"
 
-#: g10/gpg.c:385 sm/gpgsm.c:254
+#: g10/gpg.c:385 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "näytä avaimet sormenjälkineen"
 
-#: g10/gpg.c:386 sm/gpgsm.c:252
+#: g10/gpg.c:386 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "näytä salaiset avaimet"
 
@@ -1592,11 +1603,11 @@ msgstr "luo mitätöintivarmenne"
 msgid "export keys"
 msgstr "vie avaimia"
 
-#: g10/gpg.c:397 sm/gpgsm.c:257
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "vie avaimia palvelimelle"
 
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "nouda avaimia avainpalvelimelta"
 
@@ -1632,11 +1643,11 @@ msgstr "päivitä luottamustietokanta"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 
-#: g10/gpg.c:430 sm/gpgsm.c:262
+#: g10/gpg.c:430 sm/gpgsm.c:264
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
 #: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1647,31 +1658,31 @@ msgstr ""
 "Valitsimet:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:279
+#: g10/gpg.c:434 sm/gpgsm.c:281
 msgid "create ascii armored output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: g10/gpg.c:436 sm/gpgsm.c:291
+#: g10/gpg.c:436 sm/gpgsm.c:293
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|salaa vastaanottajalle NIMI"
 
-#: g10/gpg.c:447 sm/gpgsm.c:327
+#: g10/gpg.c:447 sm/gpgsm.c:331
 msgid "use this user-id to sign or decrypt"
 msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
 
-#: g10/gpg.c:448 sm/gpgsm.c:330
+#: g10/gpg.c:448 sm/gpgsm.c:334
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:332
+#: g10/gpg.c:453 sm/gpgsm.c:336
 msgid "use canonical text mode"
 msgstr "käytä tekstimuotoa"
 
-#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "käytä tulostustiedostona"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "älä tee muutoksia"
 
@@ -1687,7 +1698,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:393
+#: g10/gpg.c:553 sm/gpgsm.c:397
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1696,7 +1707,7 @@ msgstr ""
 "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
 "sivuilta)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:396
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1734,7 +1745,7 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:532
+#: g10/gpg.c:781 sm/gpgsm.c:538
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1762,7 +1773,7 @@ msgstr "Pakkaus: "
 msgid "usage: gpg [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:669
+#: g10/gpg.c:1045 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
 
@@ -1838,462 +1849,462 @@ msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1554
+#: 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:1556
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1560
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
 
-#: g10/gpg.c:1564
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1827
+#: g10/gpg.c:1825
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1981
 #, 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:2243 g10/gpg.c:2884 g10/gpg.c:2896
+#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
 
-#: g10/gpg.c:2401 g10/gpg.c:2413
+#: g10/gpg.c:2399 g10/gpg.c:2411
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2493
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4084
+#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2528
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2531
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2538
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2541
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2548
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2551
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2558
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2561
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2569
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2571
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2573
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2575
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2579
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2581
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2585
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2587
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2589
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2591
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2598
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2608
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2782
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2787
+#: g10/gpg.c:2785
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2873 sm/gpgsm.c:1220
+#: g10/gpg.c:2871 sm/gpgsm.c:1247
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2875
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2884
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2887
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2902
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/gpg.c:2918
+#: g10/gpg.c:2916
 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:2924
+#: g10/gpg.c:2922
 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:2930
+#: g10/gpg.c:2928
 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:2943
+#: g10/gpg.c:2941
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 
-#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
+#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1303
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
+#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1311
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3025
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3040
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3042
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3044
 #, 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:3048
+#: g10/gpg.c:3046
 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:3050
+#: g10/gpg.c:3048
 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:3053
+#: g10/gpg.c:3051
 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:3057
+#: g10/gpg.c:3055
 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:3064
+#: g10/gpg.c:3062
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3071
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3075
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3079
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/gpg.c:3114
+#: g10/gpg.c:3112
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3159
 #, 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:3166
+#: g10/gpg.c:3164
 #, 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:3171
+#: g10/gpg.c:3169
 #, 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:3263
+#: g10/gpg.c:3261
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3272
 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:3295
+#: g10/gpg.c:3293
 msgid "--store [filename]"
 msgstr "--store [tiedostonimi]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3300
 msgid "--symmetric [filename]"
 msgstr "--symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3302
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3312
 msgid "--encrypt [filename]"
 msgstr "--encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3325
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3327
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3332
+#: g10/gpg.c:3330
 #, 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:3350
+#: g10/gpg.c:3348
 msgid "--sign [filename]"
 msgstr "--allekirjoita [tiedostonimi]"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3361
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3376
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3378
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3381
 #, 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:3403
+#: g10/gpg.c:3401
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3410
 msgid "--clearsign [filename]"
 msgstr "--clearsign [tiedostonimi]"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3435
 msgid "--decrypt [filename]"
 msgstr "--decrypt [tiedostonimi]"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3443
 msgid "--sign-key user-id"
 msgstr "--sign-key käyttäjätunnus"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3447
 msgid "--lsign-key user-id"
 msgstr "--lsign-key käyttäjätunnus"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3468
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key käyttäjätunnus [komennot]"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3553
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3557
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3568
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3580
+#: g10/gpg.c:3578
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/gpg.c:3631
+#: g10/gpg.c:3629
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/gpg.c:3639
+#: g10/gpg.c:3637
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3729
+#: g10/gpg.c:3727
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3844
 msgid "[filename]"
 msgstr "[tiedostonimi]"
 
-#: g10/gpg.c:3850
+#: g10/gpg.c:3848
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4160
 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:4162
 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:4195
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@ -2306,7 +2317,7 @@ msgstr "ota avaimet tästä avainrenkaasta"
 msgid "make timestamp conflicts only a warning"
 msgstr "käsittele aikaleimakonfliktit pelkkinä varoituksina"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:368
+#: g10/gpgv.c:75 sm/gpgsm.c:372
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
 
@@ -6779,64 +6790,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: scd/scdaemon.c:105
+#: scd/scdaemon.c:108
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:357
+#: scd/scdaemon.c:114 sm/gpgsm.c:361
 #, fuzzy
 msgid "read options from file"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:124
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:129
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "älä käytä lainkaan päätettä"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:134
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:135
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "ristiriitainen komento\n"
 
-#: scd/scdaemon.c:206
+#: scd/scdaemon.c:209
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: scd/scdaemon.c:208
+#: scd/scdaemon.c:211
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:671
+#: scd/scdaemon.c:658
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1019
+#: scd/scdaemon.c:1006
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1024
+#: scd/scdaemon.c:1011
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6865,143 +6876,257 @@ msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:174
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr ""
+
+#: sm/certchain.c:195
+msgid "chain"
+msgstr ""
+
+#: sm/certchain.c:196
+#, fuzzy
+msgid "shell"
+msgstr "apua"
+
+#: sm/certchain.c:241
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
 
-#: sm/certchain.c:212
+#: sm/certchain.c:279
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:250
+#: sm/certchain.c:317
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:260
+#: sm/certchain.c:327
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
-#: sm/certchain.c:267 sm/certchain.c:296
+#: sm/certchain.c:334 sm/certchain.c:363
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:271 sm/certchain.c:300
+#: sm/certchain.c:338 sm/certchain.c:367
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: sm/certchain.c:411
+#: sm/certchain.c:478
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:431
+#: sm/certchain.c:498
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: sm/certchain.c:675
+#: sm/certchain.c:742
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "HUOM: avain on mitätöity!"
 
-#: sm/certchain.c:684
+#: sm/certchain.c:752
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "virheellinen varmenne"
 
-#: sm/certchain.c:688
+#: sm/certchain.c:757
+msgid "the status of the certificate is unknown"
+msgstr ""
+
+#: sm/certchain.c:762
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Avain saatavilla kohteessa: "
 
-#: sm/certchain.c:690
+#: sm/certchain.c:764
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:695
+#: sm/certchain.c:770
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: sm/certchain.c:791
-#, fuzzy
-msgid "no issuer found in certificate"
-msgstr "luo mitätöintivarmenne"
-
-#: sm/certchain.c:820
+#: sm/certchain.c:799 sm/certchain.c:867
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:836
+#: sm/certchain.c:814 sm/certchain.c:899
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:849
+#: sm/certchain.c:815 sm/certchain.c:900
+#, fuzzy
+msgid "root certificate not yet valid"
+msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
+
+#: sm/certchain.c:816 sm/certchain.c:901
+msgid "intermediate certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:829
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Tämä avain on vanhentunut!"
 
-#: sm/certchain.c:892
-msgid "self-signed certificate has a BAD signature"
+#: sm/certchain.c:830
+#, fuzzy
+msgid "root certificate has expired"
+msgstr "Tämä avain on vanhentunut!"
+
+#: sm/certchain.c:831
+#, fuzzy
+msgid "intermediate certificate has expired"
+msgstr "Tämä avain on vanhentunut!"
+
+#: sm/certchain.c:873
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:960
-msgid "root certificate is not marked trusted"
+#: sm/certchain.c:882
+#, fuzzy
+msgid "certificate with invalid validity"
+msgstr "Tämä avain on vanhentunut!"
+
+#: sm/certchain.c:919
+msgid "signature not created during lifetime of certificate"
+msgstr ""
+
+#: sm/certchain.c:921
+msgid "certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:922
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:926
+#, fuzzy
+msgid "  (  signature created at "
+msgstr "        uusia allekirjoituksia: %lu\n"
+
+#: sm/certchain.c:927
+#, fuzzy
+msgid "  (certificate created at "
+msgstr "Mitätöintivarmenne luotu.\n"
+
+#: sm/certchain.c:930
+#, fuzzy
+msgid "  (certificate valid from "
+msgstr "virheellinen varmenne"
+
+#: sm/certchain.c:931
+msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:975
+#: sm/certchain.c:961
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "näytä sormenjälki"
 
-#: sm/certchain.c:983
+#: sm/certchain.c:970
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:998
+#: sm/certchain.c:983
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1004
+#: sm/certchain.c:989
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1046
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr ""
+
+#: sm/certchain.c:1110
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "luo mitätöintivarmenne"
+
+#: sm/certchain.c:1184
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:1253
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:1266
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: sm/certchain.c:1041 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1053
+#: sm/certchain.c:1307
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1086
+#: sm/certchain.c:1340
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "tarkista allekirjoitus"
 
-#: sm/certchain.c:1116
+#: sm/certchain.c:1371
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1167
+#: sm/certchain.c:1422
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
+#: sm/certchain.c:1462 sm/certchain.c:1730
+#, fuzzy
+msgid "certificate is good\n"
+msgstr "valinta %c%lu on kopio\n"
+
+#: sm/certchain.c:1463
+#, fuzzy
+msgid "intermediate certificate is good\n"
+msgstr "Mitätöintivarmenne luotu.\n"
+
+#: sm/certchain.c:1464
+#, fuzzy
+msgid "root certificate is good\n"
+msgstr "virheellinen varmenne"
+
+#: sm/certchain.c:1620
+msgid "switching to chain model"
+msgstr ""
+
+#: sm/certchain.c:1629
+#, c-format
+msgid "validation model used: %s"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "chain model"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "shell model"
+msgstr ""
+
 #: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
@@ -7049,7 +7174,7 @@ msgstr "virhe: sormenjälki on väärä\n"
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
 "\"%s\"\n"
-"S/N %s, ID %08lX, created %s"
+"S/N %s, ID 0x%08lX, created %s"
 msgstr ""
 "Tarvitset salasanan avataksesi salaisen avaimen käyttäjälle:\n"
 "\"%.*s\"\n"
@@ -7059,7 +7184,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:131 sm/keylist.c:255
+#: sm/certlist.c:131 sm/keylist.c:258
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
@@ -7181,181 +7306,181 @@ msgstr "virhe luotaessa salasanaa: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[tiedosto]|tee allekirjoitus"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
 
-#: sm/gpgsm.c:251
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list external keys"
 msgstr "näytä salaiset avaimet"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list certificate chain"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:256
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "poista avaimet julkisten avainten renkaasta"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "import certificates"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:262
 #, fuzzy
 msgid "export certificates"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:268
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muuta salasanaa"
 
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:287
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:296
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:302
+#: sm/gpgsm.c:304
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:305
+#: sm/gpgsm.c:309
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:312
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:315
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:319
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:323
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:325
 msgid "use the default key as default recipient"
 msgstr "käytä oletusavainta oletusvastaanottajana"
 
-#: sm/gpgsm.c:338
+#: sm/gpgsm.c:342
 msgid "don't use the terminal at all"
 msgstr "älä käytä lainkaan päätettä"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:346
 msgid "force v3 signatures"
 msgstr "käytä aina v3-allekirjoituksia"
 
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:347
 msgid "always use a MDC for encryption"
 msgstr "käytä aina MDC:tä salaamiseen"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:352
 msgid "batch mode: never ask"
 msgstr "eräajo: älä kysy mitään"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:353
 msgid "assume yes on most questions"
 msgstr "oleta myönteinen vastaust useimpiin kysymyksiin"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:354
 msgid "assume no on most questions"
 msgstr "oleta kielteinen vastaust useimpiin kysymyksiin"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:356
 msgid "add this keyring to the list of keyrings"
 msgstr "lisää tämä avainrengas avainrenkaiden luetteloon"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:357
 msgid "add this secret keyring to the list"
 msgstr "lisää tämä salainen avainrengas luetteloon"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:359
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|PALVELIN|käytä tätä palvelinta avainten etsimiseen"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:360
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NIMI|aseta päätteen merkistöksi NIMI"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:364
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:375
+#: sm/gpgsm.c:379
 msgid "|FILE|load extension module FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: sm/gpgsm.c:381
+#: sm/gpgsm.c:385
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI|käytä salausalgoritmia NIMI"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:387
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|käytä viestintiivistealgoritmia NIMI"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:389
 msgid "|N|use compress algorithm N"
 msgstr "|N|käytä pakkausalgoritmia N"
 
-#: sm/gpgsm.c:522
+#: sm/gpgsm.c:528
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: sm/gpgsm.c:525
+#: sm/gpgsm.c:531
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7366,31 +7491,36 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: sm/gpgsm.c:604
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: sm/gpgsm.c:685
+#: sm/gpgsm.c:691
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
 
-#: sm/gpgsm.c:1237
+#: sm/gpgsm.c:713
+#, fuzzy, c-format
+msgid "unknown validation model `%s'\n"
+msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
+
+#: sm/gpgsm.c:1264
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1316
+#: sm/gpgsm.c:1344
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: sm/gpgsm.c:1334
+#: sm/gpgsm.c:1362
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: sm/gpgsm.c:1529
+#: sm/gpgsm.c:1543
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7413,7 +7543,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:375
+#: sm/import.c:541 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -7497,7 +7627,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234
+#: sm/qualified.c:234 sm/verify.c:536
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7516,30 +7646,37 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: sm/verify.c:386
+#: sm/verify.c:388
 #, fuzzy
 msgid "Signature made "
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: sm/verify.c:390
+#: sm/verify.c:392
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:391
-#, c-format
-msgid " using certificate ID %08lX\n"
-msgstr ""
+#: sm/verify.c:393
+#, fuzzy, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/verify.c:507
+#: sm/verify.c:514
 #, fuzzy
 msgid "Good signature from"
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: sm/verify.c:508
+#: sm/verify.c:515
 #, fuzzy
 msgid "                aka"
 msgstr "                aka \""
 
+#: sm/verify.c:533
+#, fuzzy
+msgid "This is a qualified signature\n"
+msgstr ""
+"\n"
+"Tämä tulee olemaan oma-allekirjoitus.\n"
+
 #: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
@@ -7576,132 +7713,137 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:315
+#: tools/gpg-connect-agent.c:314
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:323
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:382
+#: tools/gpg-connect-agent.c:381
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "rivi on liian pitkä\n"
 
-#: tools/gpg-connect-agent.c:386
+#: tools/gpg-connect-agent.c:385
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:458
+#: tools/gpg-connect-agent.c:457
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:466
+#: tools/gpg-connect-agent.c:465
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
 
-#: tools/gpg-connect-agent.c:474
+#: tools/gpg-connect-agent.c:473
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: tools/gpg-connect-agent.c:784
+#: tools/gpg-connect-agent.c:789
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: tools/gpg-connect-agent.c:793
+#: tools/gpg-connect-agent.c:798
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
+#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
-#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
+#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
-#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:501
+#: tools/gpgconf-comp.c:492
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:505
+#: tools/gpgconf-comp.c:496
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:509
+#: tools/gpgconf-comp.c:500
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:510
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:638
+#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#, fuzzy
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NIMI|salaa vastaanottajalle NIMI"
+
+#: tools/gpgconf-comp.c:635
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:640
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NIMI|käytä salasanoihin salausalgoritmia NIMI"
 
-#: tools/gpgconf-comp.c:705
+#: tools/gpgconf-comp.c:708
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:749
+#: tools/gpgconf-comp.c:752
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:785
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:806
+#: tools/gpgconf-comp.c:809
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:814
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:848
+#: tools/gpgconf-comp.c:851
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2681
+#: tools/gpgconf-comp.c:2684
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8319,9 +8461,6 @@ msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 #~ msgid "q"
 #~ msgstr "q"
 
-#~ msgid "help"
-#~ msgstr "apua"
-
 #~ msgid "list"
 #~ msgstr "list"
 
diff --git a/po/fr.po b/po/fr.po
index 52269f200..94ec4945e 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-07-05 18:01+0200\n"
+"POT-Creation-Date: 2007-08-10 15:49+0200\n"
 "PO-Revision-Date: 2005-06-28 00:24+0200\n"
 "Last-Translator: Ga�l Qu�ri <gael@lautre.net>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -24,54 +24,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "impossible de stocker l'empreinte: %s\n"
 
-#: agent/call-pinentry.c:426
+#: agent/call-pinentry.c:436
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:429
+#: agent/call-pinentry.c:439
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: agent/call-pinentry.c:476
+#: agent/call-pinentry.c:486
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
+#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
 #, fuzzy
 msgid "PIN too long"
 msgstr "ligne trop longue"
 
-#: agent/call-pinentry.c:497
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "ligne trop longue"
 
-#: agent/call-pinentry.c:505
+#: agent/call-pinentry.c:515
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:520
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:522
+#: agent/call-pinentry.c:532
 #, fuzzy
 msgid "Bad PIN"
 msgstr "mauvais entier en pr�cision multiple (MPI)"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:533
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "mauvaise phrase de passe"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:569
 #, fuzzy
 msgid "Passphrase"
 msgstr "mauvaise phrase de passe"
@@ -88,14 +88,14 @@ msgstr "le hachage de protection %d n'est pas support�\n"
 msgid "can't create `%s': %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
 #: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
-#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1796
+#: sm/gpgsm.c:1833 sm/gpgsm.c:1871 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
@@ -185,12 +185,23 @@ msgstr[1] ""
 msgid "Take this one anyway"
 msgstr "Utiliser cette cl� quand m�me ? (o/N) "
 
-#: agent/genkey.c:99
+#: agent/genkey.c:99 agent/genkey.c:114
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Entrez la phrase de passe\n"
 
-#: agent/genkey.c:144
+#: agent/genkey.c:107
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+
+#: agent/genkey.c:113
+msgid "Yes, protection is not needed"
+msgstr ""
+
+#: agent/genkey.c:158
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
@@ -198,23 +209,23 @@ msgstr ""
 "secr�te.\n"
 "\n"
 
-#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
+#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "changer la phrase de passe"
 
-#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
 #: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:263
+#: agent/genkey.c:280
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "changer la phrase de passe"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -224,107 +235,107 @@ msgstr ""
 "Options:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:103
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
-#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
 #: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "bavard"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
-#: sm/gpgsm.c:337
+#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:109
+#: agent/gpg-agent.c:118 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "lire les options de `%s'\n"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:119
+#: agent/gpg-agent.c:125 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:125
+#: agent/gpg-agent.c:126
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "chercher les cl�s avec un serveur de cl�s"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:129
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "indiquer la liste des pr�f�rences pour le nom d'utilisateur\n"
 "s�lectionn�"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "mettre la base de confiance � jour"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:145
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:206 sm/gpgsm.c:525 tools/gpg-connect-agent.c:124
 #: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
@@ -332,145 +343,145 @@ msgstr ""
 "Signaler toutes anomalies � <gnupg-bugs@gnu.org> (en anglais)\n"
 "et tout probl�me de traduction � <traduc@traduc.org>.\n"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:262
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
+#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
-#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:340 sm/gpgsm.c:772 sm/gpgsm.c:775 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
+#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:863
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTE: pas de fichier d'options par d�faut `%s'\n"
 
-#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
-#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: scd/scdaemon.c:421 sm/gpgsm.c:867 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
+#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:874
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erreur pendant la cr�ation de `%s': %s\n"
 
-#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
-#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:921
+#: agent/gpg-agent.c:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
+#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:908
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "impossible de cr�er le r�pertoire `%s': %s\n"
 
-#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
+#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent n'est pas disponible dans cette session\n"
 
-#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
+#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr ""
 "erreur pendant la recherche de l'enregistrement de confiance\n"
 "dans `%s': %s\n"
 
-#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
+#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "�criture de la cl� secr�te dans `%s'\n"
 
-#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
+#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "r�pertoire `%s' cr��\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1377
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) �chou� dans %s: %s\n"
 
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1381
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "impossible de cr�er le r�pertoire `%s': %s\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1497
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1519
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
+#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
 
-#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
+#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ignor�: %s\n"
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1752
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent n'est pas disponible dans cette session\n"
 
-#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:751
+#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'environnement GPG_AGENT_INFO est mal d�finie\n"
 
-#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
-#: tools/gpg-connect-agent.c:762
+#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "le protocole gpg-agent version %d n'est pas support�\n"
@@ -535,42 +546,42 @@ msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 msgid "cancelled\n"
 msgstr "annul�"
 
-#: agent/trustlist.c:131 agent/trustlist.c:319
+#: agent/trustlist.c:132 agent/trustlist.c:322
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "erreur dans `%s': %s\n"
 
-#: agent/trustlist.c:146
+#: agent/trustlist.c:147
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: agent/trustlist.c:166 agent/trustlist.c:174
+#: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:180
+#: agent/trustlist.c:181
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "les parties secr�tes ne sont pas disponibles\n"
 
-#: agent/trustlist.c:215
+#: agent/trustlist.c:216
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "erreur de lecture dans `%s': %s\n"
 
-#: agent/trustlist.c:241 agent/trustlist.c:248
+#: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:280
+#: agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: agent/trustlist.c:381 agent/trustlist.c:420
+#: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -583,7 +594,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:496
+#: agent/trustlist.c:507
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -593,7 +604,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:505
+#: agent/trustlist.c:516
 msgid "Correct"
 msgstr ""
 
@@ -605,60 +616,60 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:525
+#: agent/trustlist.c:536
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 #, fuzzy
 msgid "Yes"
 msgstr "oui"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:393
+#: common/exechelp.c:302 common/exechelp.c:390
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: common/exechelp.c:369 common/exechelp.c:426
+#: common/exechelp.c:366 common/exechelp.c:423
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
 
-#: common/exechelp.c:405 common/exechelp.c:635
+#: common/exechelp.c:402 common/exechelp.c:632
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: common/exechelp.c:461 common/exechelp.c:504
+#: common/exechelp.c:458 common/exechelp.c:501
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:469
+#: common/exechelp.c:466
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr ""
 "erreur durant la lecture des informations contenues actuellement\n"
 "dans la cl�: %s\n"
 
-#: common/exechelp.c:475 common/exechelp.c:515
+#: common/exechelp.c:472 common/exechelp.c:512
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: common/exechelp.c:510
+#: common/exechelp.c:507
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:521
+#: common/exechelp.c:518
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
@@ -677,25 +688,25 @@ msgstr "[Nom utilisateur introuvable]"
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent n'est pas disponible dans cette session\n"
 
-#: common/simple-pwquery.c:376
+#: common/simple-pwquery.c:373
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossible de se connecter � `%s': %s\n"
 
-#: common/simple-pwquery.c:387
+#: common/simple-pwquery.c:384
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:397
+#: common/simple-pwquery.c:394
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+#: common/simple-pwquery.c:557 common/simple-pwquery.c:653
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "annul� par l'utilisateur\n"
 
-#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+#: common/simple-pwquery.c:572 common/simple-pwquery.c:659
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "probl�me avec l'agent - arr�t d'utilisation de l'agent\n"
@@ -877,7 +888,7 @@ msgstr "ATTENTION: des donn�es de notation invalides ont �t� d�tect�es\n"
 msgid "not human readable"
 msgstr "illisible par un humain"
 
-#: g10/card-util.c:62 g10/card-util.c:305
+#: g10/card-util.c:62 g10/card-util.c:308
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la carte OpenPGP n'est pas disponible: %s\n"
@@ -887,157 +898,157 @@ 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:75 g10/card-util.c:1391 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
 #: g10/keygen.c:1644
 msgid "Your selection? "
 msgstr "Votre choix ? "
 
-#: g10/card-util.c:215 g10/card-util.c:265
+#: g10/card-util.c:218 g10/card-util.c:268
 msgid "[not set]"
 msgstr "[non positionn�]"
 
-#: g10/card-util.c:412
+#: g10/card-util.c:415
 msgid "male"
 msgstr "masculin"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "female"
 msgstr "f�minin"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "unspecified"
 msgstr "non sp�cifi�"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "not forced"
 msgstr "non forc�"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "forced"
 msgstr "forc�"
 
-#: g10/card-util.c:518
+#: g10/card-util.c:521
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Erreur: Seul l'ASCII standard est permis pour l'instant.\n"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:523
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Erreur: Le caract�re � < � ne peut pas �tre utilis�.\n"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:525
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Erreur: Les espaces doubles ne sont pas permis.\n"
 
-#: g10/card-util.c:539
+#: g10/card-util.c:542
 msgid "Cardholder's surname: "
 msgstr "Nom du d�teneur de la carte: "
 
-#: g10/card-util.c:541
+#: g10/card-util.c:544
 msgid "Cardholder's given name: "
 msgstr "Pr�nom du d�teneur de la carte: "
 
-#: g10/card-util.c:559
+#: g10/card-util.c:562
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Erreur: Nom combin� trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:580
+#: g10/card-util.c:583
 msgid "URL to retrieve public key: "
 msgstr "URL pour r�cup�rer la cl� publique: %s"
 
-#: g10/card-util.c:588
+#: g10/card-util.c:591
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Erreur: URL trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
+#: g10/card-util.c:689 g10/card-util.c:758 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: g10/card-util.c:694
+#: g10/card-util.c:697
 msgid "Login data (account name): "
 msgstr "Donn�es d'identification (nom du compte): "
 
-#: g10/card-util.c:704
+#: g10/card-util.c:707
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 "Erreur: Donn�es d'indentification trop longues (la limite est\n"
 "%d caract�res).\n"
 
-#: g10/card-util.c:763
+#: g10/card-util.c:766
 msgid "Private DO data: "
 msgstr "Donn�es DO priv�es: "
 
-#: g10/card-util.c:773
+#: g10/card-util.c:776
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Erreur: DO priv� trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:793
+#: g10/card-util.c:796
 msgid "Language preferences: "
 msgstr "Pr�f�rences de langue: "
 
-#: g10/card-util.c:801
+#: g10/card-util.c:804
 msgid "Error: invalid length of preference string.\n"
 msgstr "Erreur: longueur invalide de la cha�ne de pr�f�rences.\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:813
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Erreur: caract�res invalide dans la cha�ne de pr�f�rences.\n"
 
-#: g10/card-util.c:831
+#: g10/card-util.c:834
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Sexe ((M)asculin, (F)�minin ou espace): "
 
-#: g10/card-util.c:845
+#: g10/card-util.c:848
 msgid "Error: invalid response.\n"
 msgstr "Erreur: r�ponse invalide.\n"
 
-#: g10/card-util.c:866
+#: g10/card-util.c:869
 msgid "CA fingerprint: "
 msgstr "empreinte de l'autorit� de certification: "
 
-#: g10/card-util.c:889
+#: g10/card-util.c:892
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Erreur: empreinte mal format�e.\n"
 
-#: g10/card-util.c:937
+#: g10/card-util.c:940
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "l'op�ration sur la cl� n'est pas possible: %s\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:941
 msgid "not an OpenPGP card"
 msgstr "ce n'est pas une carte OpenPGP"
 
-#: g10/card-util.c:947
+#: g10/card-util.c:950
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 "erreur durant la lecture des informations contenues actuellement\n"
 "dans la cl�: %s\n"
 
-#: g10/card-util.c:1031
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr "Remplacer la cl� existante ? (o/N) "
 
-#: g10/card-util.c:1051 g10/card-util.c:1060
+#: g10/card-util.c:1054 g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Faire une sauvegarde hors carte de la cl� de chiffrement ? (O/n) "
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1075
 msgid "Replace existing keys? (y/N) "
 msgstr "Remplacer les cl�s existantes ? (o/N) "
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1084
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1048,122 +1059,122 @@ msgstr ""
 "   PIN = `%s'     PIN admin = `%s'\n"
 "Vous devriez les changer avec la commande --change-pin\n"
 
-#: g10/card-util.c:1115
+#: g10/card-util.c:1118
 msgid "Please select the type of key to generate:\n"
 msgstr "S�lectionnez le type de cl� � g�n�rer:\n"
 
-#: g10/card-util.c:1117 g10/card-util.c:1194
+#: g10/card-util.c:1120 g10/card-util.c:1197
 msgid "   (1) Signature key\n"
 msgstr "   (1) Cl� de signature\n"
 
-#: g10/card-util.c:1118 g10/card-util.c:1196
+#: g10/card-util.c:1121 g10/card-util.c:1199
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Cl� de chiffrement\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1198
+#: g10/card-util.c:1122 g10/card-util.c:1201
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cl� d'authentification\n"
 
-#: g10/card-util.c:1135 g10/card-util.c:1214 g10/keyedit.c:945
+#: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
 #: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
-#: g10/card-util.c:1191
+#: g10/card-util.c:1194
 msgid "Please select where to store the key:\n"
 msgstr "S�lectionnez l'endroit o� stocker la cl�:\n"
 
-#: g10/card-util.c:1226
+#: g10/card-util.c:1229
 msgid "unknown key protection algorithm\n"
 msgstr "algorithme de protection de cl� inconnu\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1234
 msgid "secret parts of key are not available\n"
 msgstr "Les parties secr�tes de la cl� ne sont pas disponibles.\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1239
 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:1304 g10/keyedit.c:1362
+#: g10/card-util.c:1307 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1309
 msgid "show admin commands"
 msgstr "indiquer les commandes d'administration"
 
-#: g10/card-util.c:1307 g10/keyedit.c:1365
+#: g10/card-util.c:1310 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "afficher cette aide"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1312
 msgid "list all available data"
 msgstr "lister toutes les donn�es disponibles"
 
-#: g10/card-util.c:1312
+#: g10/card-util.c:1315
 msgid "change card holder's name"
 msgstr "changer le nom du propri�taire de la carte"
 
-#: g10/card-util.c:1313
+#: g10/card-util.c:1316
 msgid "change URL to retrieve key"
 msgstr "changer l'URL pour r�cup�rer la cl�"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1317
 msgid "fetch the key specified in the card URL"
 msgstr "aller chercher la cl� sp�cifi�e dans l'URL de la carte"
 
-#: g10/card-util.c:1315
+#: g10/card-util.c:1318
 msgid "change the login name"
 msgstr "changer le nom d'identification"
 
-#: g10/card-util.c:1316
+#: g10/card-util.c:1319
 msgid "change the language preferences"
 msgstr "changer les pr�f�rences de langue"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1320
 msgid "change card holder's sex"
 msgstr "changer le sexe du propri�taire de la carte"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1321
 msgid "change a CA fingerprint"
 msgstr "changer l'empreinte d'une autorit� de certification"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1322
 msgid "toggle the signature force PIN flag"
 msgstr ""
 "inverser le param�tre obligeant � rentrer le code PIN pour les\n"
 "signatures"
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1323
 msgid "generate new keys"
 msgstr "g�n�rer de nouvelles cl�s"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1324
 msgid "menu to change or unblock the PIN"
 msgstr "menu pour changer ou d�verrouiller le PIN"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1325
 msgid "verify the PIN and list all data"
 msgstr "v�rifier le code PIN et lister toutes les donn�es"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1634
+#: g10/card-util.c:1445 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Commande> "
 
-#: g10/card-util.c:1480
+#: g10/card-util.c:1483
 msgid "Admin-only command\n"
 msgstr "La commande n'est utilisable qu'en mode administration\n"
 
-#: g10/card-util.c:1511
+#: g10/card-util.c:1514
 msgid "Admin commands are allowed\n"
 msgstr "Les commandes d'administration sont permises\n"
 
-#: g10/card-util.c:1513
+#: g10/card-util.c:1516
 msgid "Admin commands are not allowed\n"
 msgstr "Les commandes d'administration ne sont pas permises\n"
 
-#: g10/card-util.c:1587 g10/keyedit.c:2255
+#: g10/card-util.c:1590 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez �help�)\n"
 
@@ -1171,7 +1182,7 @@ msgstr "Commande invalide  (essayez �help�)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output n'est pas compatible avec cette commande\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
@@ -1488,7 +1499,7 @@ msgstr ""
 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/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1504,27 +1515,27 @@ msgstr "|[fichier]|faire une signature"
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/gpg.c:372 sm/gpgsm.c:244
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/gpg.c:375 sm/gpgsm.c:246
+#: g10/gpg.c:375 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/gpg.c:377 sm/gpgsm.c:247
+#: g10/gpg.c:377 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:248
+#: g10/gpg.c:379 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/gpg.c:381 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "lister les cl�s"
 
@@ -1536,11 +1547,11 @@ msgstr "lister les cl�s et les signatures"
 msgid "list and check key signatures"
 msgstr "lister et v�rifier les signatures des cl�s"
 
-#: g10/gpg.c:385 sm/gpgsm.c:254
+#: g10/gpg.c:385 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/gpg.c:386 sm/gpgsm.c:252
+#: g10/gpg.c:386 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
@@ -1576,11 +1587,11 @@ msgstr "g�n�rer un certificat de r�vocation"
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/gpg.c:397 sm/gpgsm.c:257
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
@@ -1616,11 +1627,11 @@ msgstr "mettre la base de confiance � jour"
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/gpg.c:430 sm/gpgsm.c:262
+#: g10/gpg.c:430 sm/gpgsm.c:264
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
 #: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1631,31 +1642,31 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:279
+#: g10/gpg.c:434 sm/gpgsm.c:281
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/gpg.c:436 sm/gpgsm.c:291
+#: g10/gpg.c:436 sm/gpgsm.c:293
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/gpg.c:447 sm/gpgsm.c:327
+#: g10/gpg.c:447 sm/gpgsm.c:331
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/gpg.c:448 sm/gpgsm.c:330
+#: g10/gpg.c:448 sm/gpgsm.c:334
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:332
+#: g10/gpg.c:453 sm/gpgsm.c:336
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
@@ -1671,7 +1682,7 @@ msgstr "utiliser strictement le comportement OpenPGP"
 msgid "generate PGP 2.x compatible messages"
 msgstr "g�n�rer des messages compatibles avec PGP 2.x"
 
-#: g10/gpg.c:553 sm/gpgsm.c:393
+#: g10/gpg.c:553 sm/gpgsm.c:397
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1679,7 +1690,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:396
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1719,7 +1730,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:781 sm/gpgsm.c:532
+#: g10/gpg.c:781 sm/gpgsm.c:538
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1747,7 +1758,7 @@ msgstr "Compression: "
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:669
+#: g10/gpg.c:1045 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
@@ -1847,470 +1858,470 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "�l�ment de configuration `%s' inconnu\n"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: 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:1548
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1554
+#: 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:1556
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1562
+#: 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:1564
+#: 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:1827
+#: g10/gpg.c:1825
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1981
 #, 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:2243 g10/gpg.c:2884 g10/gpg.c:2896
+#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
 #, 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:2401 g10/gpg.c:2413
+#: g10/gpg.c:2399 g10/gpg.c:2411
 #, 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:2495
+#: g10/gpg.c:2493
 #, 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:2518 g10/gpg.c:2713 g10/keyedit.c:4084
+#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'interpr�ter l'URL du serveur de cl�s\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2528
 #, 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:2533
+#: g10/gpg.c:2531
 msgid "invalid keyserver options\n"
 msgstr "les options du serveur de cl�s sont invalides\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2538
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: options d'import invalides\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2541
 msgid "invalid import options\n"
 msgstr "options d'import invalides\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2548
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2551
 msgid "invalid export options\n"
 msgstr "options d'export invalides\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2558
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: options de liste invalides\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2561
 msgid "invalid list options\n"
 msgstr "options de liste invalides\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2569
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2571
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2573
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2575
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2579
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2581
 #, 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:2585
+#: g10/gpg.c:2583
 #, 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:2587
+#: g10/gpg.c:2585
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2587
 #, 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
+#: g10/gpg.c:2589
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2591
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2598
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2601
 msgid "invalid verify options\n"
 msgstr "options de v�rification invalides\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2608
 #, 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:2784
+#: g10/gpg.c:2782
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2787
+#: g10/gpg.c:2785
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2873 sm/gpgsm.c:1220
+#: g10/gpg.c:2871 sm/gpgsm.c:1247
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2875
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2884
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2887
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2902
 #, 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:2918
+#: g10/gpg.c:2916
 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:2924
+#: g10/gpg.c:2922
 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:2930
+#: g10/gpg.c:2928
 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:2943
+#: g10/gpg.c:2941
 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:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
+#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1303
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
+#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1311
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de compression s�lectionn� est invalide\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3025
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "la fonction de hachage de certification s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3040
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3042
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3044
 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:3048
+#: g10/gpg.c:3046
 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:3050
+#: g10/gpg.c:3048
 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:3053
+#: g10/gpg.c:3051
 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:3057
+#: g10/gpg.c:3055
 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:3064
+#: g10/gpg.c:3062
 msgid "invalid default preferences\n"
 msgstr "pr�f�rences par d�faut invalides\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3071
 msgid "invalid personal cipher preferences\n"
 msgstr "pr�f�rences de chiffrement personnelles invalides\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3075
 msgid "invalid personal digest preferences\n"
 msgstr "pr�f�rences de hachage personnelles invalides\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3079
 msgid "invalid personal compress preferences\n"
 msgstr "pr�f�rences de compression personnelles invalides\n"
 
-#: g10/gpg.c:3114
+#: g10/gpg.c:3112
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne marche pas encore avec %s\n"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3159
 #, 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:3166
+#: g10/gpg.c:3164
 #, 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:3171
+#: g10/gpg.c:3169
 #, 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:3263
+#: g10/gpg.c:3261
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3272
 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:3295
+#: g10/gpg.c:3293
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3300
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3302
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "le chiffrement sym�trique de `%s' a �chou�: %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3312
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3325
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3327
 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:3332
+#: g10/gpg.c:3330
 #, 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:3350
+#: g10/gpg.c:3348
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3361
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3376
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3378
 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:3383
+#: g10/gpg.c:3381
 #, 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:3403
+#: g10/gpg.c:3401
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3410
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3435
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3443
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3447
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3468
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3553
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3555
 #, 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:3559
+#: g10/gpg.c:3557
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'export de la cl� a �chou�: %s\n"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3568
 #, 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:3580
+#: g10/gpg.c:3578
 #, 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:3631
+#: g10/gpg.c:3629
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/gpg.c:3639
+#: g10/gpg.c:3637
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/gpg.c:3729
+#: g10/gpg.c:3727
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3844
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/gpg.c:3850
+#: g10/gpg.c:3848
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4160
 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:4162
 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:4195
 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"
 
@@ -2324,7 +2335,7 @@ msgstr ""
 "faire en sorte que les conflits d'horodatage ne soient qu'un\n"
 "avertissement non fatal"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:368
+#: g10/gpgv.c:75 sm/gpgsm.c:372
 msgid "|FD|write status info to this FD"
 msgstr "|FD|�crire l'�tat sur ce descripteur"
 
@@ -6810,61 +6821,61 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "impossible d'acc�der � %s - carte OpenPGP invalide ?\n"
 
-#: scd/scdaemon.c:105
+#: scd/scdaemon.c:108
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:357
+#: scd/scdaemon.c:114 sm/gpgsm.c:361
 #, fuzzy
 msgid "read options from file"
 msgstr "lire les options de `%s'\n"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:124
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:126
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:129
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:134
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:135
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "indiquer les commandes d'administration"
 
-#: scd/scdaemon.c:206
+#: scd/scdaemon.c:209
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: scd/scdaemon.c:208
+#: scd/scdaemon.c:211
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:671
+#: scd/scdaemon.c:658
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1019
+#: scd/scdaemon.c:1006
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1024
+#: scd/scdaemon.c:1011
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6893,143 +6904,257 @@ msgstr "le protocole gpg-agent version %d n'est pas support�\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:174
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr ""
+
+#: sm/certchain.c:195
+msgid "chain"
+msgstr ""
+
+#: sm/certchain.c:196
+msgid "shell"
+msgstr ""
+
+#: sm/certchain.c:241
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "le protocole gpg-agent version %d n'est pas support�\n"
 
-#: sm/certchain.c:212
+#: sm/certchain.c:279
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:250
+#: sm/certchain.c:317
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:260
+#: sm/certchain.c:327
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "Impossible d'ouvrir `%s': %s\n"
 
-#: sm/certchain.c:267 sm/certchain.c:296
+#: sm/certchain.c:334 sm/certchain.c:363
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:271 sm/certchain.c:300
+#: sm/certchain.c:338 sm/certchain.c:367
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "il est interdit d'exporter les cl� secr�tes\n"
 
-#: sm/certchain.c:411
+#: sm/certchain.c:478
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:431
+#: sm/certchain.c:498
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "le stockage de la cl� a �chou�: %s\n"
 
-#: sm/certchain.c:675
+#: sm/certchain.c:742
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTE: la cl� a �t� r�voqu�e"
 
-#: sm/certchain.c:684
+#: sm/certchain.c:752
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "mauvais certificat"
 
-#: sm/certchain.c:688
+#: sm/certchain.c:757
+msgid "the status of the certificate is unknown"
+msgstr ""
+
+#: sm/certchain.c:762
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Cl� disponible sur: "
 
-#: sm/certchain.c:690
+#: sm/certchain.c:764
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:695
+#: sm/certchain.c:770
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "Impossible de v�rifier la signature cr��e: %s\n"
 
-#: sm/certchain.c:791
-#, fuzzy
-msgid "no issuer found in certificate"
-msgstr "g�n�rer un certificat de r�vocation"
-
-#: sm/certchain.c:820
+#: sm/certchain.c:799 sm/certchain.c:867
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:836
+#: sm/certchain.c:814 sm/certchain.c:899
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:849
+#: sm/certchain.c:815 sm/certchain.c:900
+#, fuzzy
+msgid "root certificate not yet valid"
+msgstr "il est interdit d'exporter les cl� secr�tes\n"
+
+#: sm/certchain.c:816 sm/certchain.c:901
+msgid "intermediate certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:829
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Cette cl� a expir� !"
 
-#: sm/certchain.c:892
-msgid "self-signed certificate has a BAD signature"
+#: sm/certchain.c:830
+#, fuzzy
+msgid "root certificate has expired"
+msgstr "Cette cl� a expir� !"
+
+#: sm/certchain.c:831
+#, fuzzy
+msgid "intermediate certificate has expired"
+msgstr "Cette cl� a expir� !"
+
+#: sm/certchain.c:873
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:960
-msgid "root certificate is not marked trusted"
+#: sm/certchain.c:882
+#, fuzzy
+msgid "certificate with invalid validity"
+msgstr "Cette cl� a expir� !"
+
+#: sm/certchain.c:919
+msgid "signature not created during lifetime of certificate"
+msgstr ""
+
+#: sm/certchain.c:921
+msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:975
+#: sm/certchain.c:922
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:926
+#, fuzzy
+msgid "  (  signature created at "
+msgstr "          signatures nettoy�es: %lu\n"
+
+#: sm/certchain.c:927
+#, fuzzy
+msgid "  (certificate created at "
+msgstr "Certificat de r�vocation cr��.\n"
+
+#: sm/certchain.c:930
+#, fuzzy
+msgid "  (certificate valid from "
+msgstr "mauvais certificat"
+
+#: sm/certchain.c:931
+#, fuzzy
+msgid "  (     issuer valid from "
+msgstr "N� de s�rie de la carte ="
+
+#: sm/certchain.c:961
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "empreinte de l'autorit� de certification: "
 
-#: sm/certchain.c:983
+#: sm/certchain.c:970
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:998
+#: sm/certchain.c:983
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1004
+#: sm/certchain.c:989
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1046
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr ""
+
+#: sm/certchain.c:1110
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "g�n�rer un certificat de r�vocation"
+
+#: sm/certchain.c:1184
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:1253
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:1266
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Impossible de v�rifier la signature cr��e: %s\n"
 
-#: sm/certchain.c:1041 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1053
+#: sm/certchain.c:1307
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1086
+#: sm/certchain.c:1340
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "v�rifier une signature"
 
-#: sm/certchain.c:1116
+#: sm/certchain.c:1371
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1167
+#: sm/certchain.c:1422
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
+#: sm/certchain.c:1462 sm/certchain.c:1730
+#, fuzzy
+msgid "certificate is good\n"
+msgstr "pr�f�rence `%s' dupliqu�e\n"
+
+#: sm/certchain.c:1463
+#, fuzzy
+msgid "intermediate certificate is good\n"
+msgstr "Certificat de r�vocation cr��.\n"
+
+#: sm/certchain.c:1464
+#, fuzzy
+msgid "root certificate is good\n"
+msgstr "mauvais certificat"
+
+#: sm/certchain.c:1620
+msgid "switching to chain model"
+msgstr ""
+
+#: sm/certchain.c:1629
+#, c-format
+msgid "validation model used: %s"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "chain model"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "shell model"
+msgstr ""
+
 #: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
@@ -7077,7 +7202,7 @@ msgstr "Erreur: r�ponse invalide.\n"
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
 "\"%s\"\n"
-"S/N %s, ID %08lX, created %s"
+"S/N %s, ID 0x%08lX, created %s"
 msgstr ""
 "Vous avez besoin d'une phrase de passe pour d�verrouiller la cl�\n"
 "secr�te pour l'utilisateur:\n"
@@ -7088,7 +7213,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:131 sm/keylist.c:255
+#: sm/certlist.c:131 sm/keylist.c:258
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr ""
@@ -7214,190 +7339,190 @@ msgstr ""
 "%s: erreur pendant l'�criture de l'enregistrement de\n"
 "r�pertoire: %s\n"
 
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: sm/gpgsm.c:251
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list external keys"
 msgstr "lister les cl�s secr�tes"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list certificate chain"
 msgstr "mauvais certificat"
 
-#: sm/gpgsm.c:256
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "enlever les cl�s du porte-cl�s public"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "import certificates"
 msgstr "mauvais certificat"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:262
 #, fuzzy
 msgid "export certificates"
 msgstr "mauvais certificat"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 #, fuzzy
 msgid "register a smartcard"
 msgstr "ajouter une cl� � une carte � puce"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:268
 #, fuzzy
 msgid "change a passphrase"
 msgstr "changer la phrase de passe"
 
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:287
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:296
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:302
+#: sm/gpgsm.c:304
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:305
+#: sm/gpgsm.c:309
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:312
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:315
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:319
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:323
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:325
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "ignor�: la cl� publique est d�j� le destinataire par d�faut\n"
 
-#: sm/gpgsm.c:338
+#: sm/gpgsm.c:342
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:346
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "v�rifier les signatures"
 
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:347
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:352
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:353
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:354
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:356
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "enlever les cl�s de ce porte-cl�s"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:357
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "Il faut la cl� secr�te pour faire cela.\n"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:359
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:360
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:364
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:375
+#: sm/gpgsm.c:379
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:381
+#: sm/gpgsm.c:385
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "algorithme de chiffrement inconnu"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:387
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "signature %s, algorithme de hachage %s\n"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:389
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "algorithme de compression inconnu"
 
-#: sm/gpgsm.c:522
+#: sm/gpgsm.c:528
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: sm/gpgsm.c:525
+#: sm/gpgsm.c:531
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7408,31 +7533,36 @@ msgstr ""
 "signer, v�rifier, chiffrer ou d�chiffrer\n"
 "l'op�ration par d�faut d�pend des donn�es entr�es\n"
 
-#: sm/gpgsm.c:604
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "utilisation: gpg [options] "
 
-#: sm/gpgsm.c:685
+#: sm/gpgsm.c:691
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "impossible de se connecter � `%s': %s\n"
 
-#: sm/gpgsm.c:1237
+#: sm/gpgsm.c:713
+#, fuzzy, c-format
+msgid "unknown validation model `%s'\n"
+msgstr "option `%s' inconnue\n"
+
+#: sm/gpgsm.c:1264
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1316
+#: sm/gpgsm.c:1344
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1334
+#: sm/gpgsm.c:1362
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "impossible d'acc�der � `%s': %s\n"
 
-#: sm/gpgsm.c:1529
+#: sm/gpgsm.c:1543
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7455,7 +7585,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:375
+#: sm/import.c:541 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
@@ -7543,7 +7673,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234
+#: sm/qualified.c:234 sm/verify.c:536
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7562,30 +7692,37 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Impossible de v�rifier la signature cr��e: %s\n"
 
-#: sm/verify.c:386
+#: sm/verify.c:388
 #, fuzzy
 msgid "Signature made "
 msgstr "Signature faite le %s\n"
 
-#: sm/verify.c:390
+#: sm/verify.c:392
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:391
-#, c-format
-msgid " using certificate ID %08lX\n"
+#: sm/verify.c:393
+#, fuzzy, c-format
+msgid " using certificate ID 0x%08lX\n"
 msgstr ""
+"erreur durant la lecture des informations contenues actuellement\n"
+"dans la cl�: %s\n"
 
-#: sm/verify.c:507
+#: sm/verify.c:514
 #, fuzzy
 msgid "Good signature from"
 msgstr "Bonne signature de � %s �"
 
-#: sm/verify.c:508
+#: sm/verify.c:515
 #, fuzzy
 msgid "                aka"
 msgstr "                alias � %s �"
 
+#: sm/verify.c:533
+#, fuzzy
+msgid "This is a qualified signature\n"
+msgstr "Ceci sera une auto-signature.\n"
+
 #: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
@@ -7622,133 +7759,138 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:315
+#: tools/gpg-connect-agent.c:314
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:323
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:382
+#: tools/gpg-connect-agent.c:381
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "ligne trop longue"
 
-#: tools/gpg-connect-agent.c:386
+#: tools/gpg-connect-agent.c:385
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:458
+#: tools/gpg-connect-agent.c:457
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "option `%s' inconnue\n"
 
-#: tools/gpg-connect-agent.c:466
+#: tools/gpg-connect-agent.c:465
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
 
-#: tools/gpg-connect-agent.c:474
+#: tools/gpg-connect-agent.c:473
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "la lecture de la cl� publique a �chou�: %s\n"
 
-#: tools/gpg-connect-agent.c:784
+#: tools/gpg-connect-agent.c:789
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:793
+#: tools/gpg-connect-agent.c:798
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr ""
 "erreur pendant la recherche de l'enregistrement de confiance\n"
 "dans `%s': %s\n"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
+#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
-#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
+#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
-#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:501
+#: tools/gpgconf-comp.c:492
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:505
+#: tools/gpgconf-comp.c:496
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:509
+#: tools/gpgconf-comp.c:500
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:510
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:638
+#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#, fuzzy
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NOM|chiffrer pour NOM"
+
+#: tools/gpgconf-comp.c:635
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:640
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:685
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:705
+#: tools/gpgconf-comp.c:708
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:749
+#: tools/gpgconf-comp.c:752
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:785
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:806
+#: tools/gpgconf-comp.c:809
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:814
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:848
+#: tools/gpgconf-comp.c:851
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2681
+#: tools/gpgconf-comp.c:2684
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/gl.po b/po/gl.po
index da3a3b5ab..44de745d1 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-07-05 18:01+0200\n"
+"POT-Creation-Date: 2007-08-10 15:49+0200\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -19,54 +19,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: agent/call-pinentry.c:426
+#: agent/call-pinentry.c:436
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:429
+#: agent/call-pinentry.c:439
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: agent/call-pinentry.c:476
+#: agent/call-pinentry.c:486
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
+#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
 #, fuzzy
 msgid "PIN too long"
 msgstr "li�a longa de m�is\n"
 
-#: agent/call-pinentry.c:497
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "contrasinal demasiado longo\n"
 
-#: agent/call-pinentry.c:505
+#: agent/call-pinentry.c:515
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter non v�lido no nome\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:520
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:522
+#: agent/call-pinentry.c:532
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI err�neo"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:533
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "contrasinal err�neo"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:569
 #, fuzzy
 msgid "Passphrase"
 msgstr "contrasinal err�neo"
@@ -83,14 +83,14 @@ msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 msgid "can't create `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
 #: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
-#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1796
+#: sm/gpgsm.c:1833 sm/gpgsm.c:1871 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
@@ -178,35 +178,46 @@ msgstr[1] ""
 msgid "Take this one anyway"
 msgstr "�Empregar esta chave de t�dolos xeitos?"
 
-#: agent/genkey.c:99
+#: agent/genkey.c:99 agent/genkey.c:114
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Introduza o contrasinal\n"
 
-#: agent/genkey.c:144
+#: agent/genkey.c:107
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+
+#: agent/genkey.c:113
+msgid "Yes, protection is not needed"
+msgstr ""
+
+#: agent/genkey.c:158
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Necesita un contrasinal para protexe-la s�a chave secreta.\n"
 "\n"
 
-#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
+#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
 #: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:263
+#: agent/genkey.c:280
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -216,107 +227,107 @@ msgstr ""
 "Opci�ns:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:103
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
-#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
 #: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "lareto"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
-#: sm/gpgsm.c:337
+#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "ser un pouqui�o m�is calado"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:109
+#: agent/gpg-agent.c:118 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:119
+#: agent/gpg-agent.c:125 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:125
+#: agent/gpg-agent.c:126
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:129
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualiza-la base de datos de confianza"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:145
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:206 sm/gpgsm.c:525 tools/gpg-connect-agent.c:124
 #: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
@@ -324,143 +335,143 @@ msgstr ""
 "Por favor, informe dos erros no programa a <gnupg-bugs@gnu.org>,\n"
 "e dos erros na traducci�n a <proxecto@trasno.net>.\n"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:262
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
+#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
-#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:340 sm/gpgsm.c:772 sm/gpgsm.c:775 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
+#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:863
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: non existe o ficheiro de opci�ns por defecto `%s'\n"
 
-#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
-#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: scd/scdaemon.c:421 sm/gpgsm.c:867 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
+#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:874
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
-#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:921
+#: agent/gpg-agent.c:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
+#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:908
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
+#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
+#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
+#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
+#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directorio creado\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1377
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1381
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: non foi posible crear un directorio: %s\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1497
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1519
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
+#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "o segredo da actualizaci�n fallou: %s\n"
 
-#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
+#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu chaves omitidas\n"
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1752
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:751
+#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
 
-#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
-#: tools/gpg-connect-agent.c:762
+#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "a versi�n %d do protocolo de gpg-agent non est� soportada\n"
@@ -525,42 +536,42 @@ msgstr "erro ao crea-lo contrasinal: %s\n"
 msgid "cancelled\n"
 msgstr "Cancelar"
 
-#: agent/trustlist.c:131 agent/trustlist.c:319
+#: agent/trustlist.c:132 agent/trustlist.c:322
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: agent/trustlist.c:146
+#: agent/trustlist.c:147
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: agent/trustlist.c:166 agent/trustlist.c:174
+#: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:180
+#: agent/trustlist.c:181
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "hai partes da chave secreta non dispo�ibles\n"
 
-#: agent/trustlist.c:215
+#: agent/trustlist.c:216
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "erro de lectura: %s\n"
 
-#: agent/trustlist.c:241 agent/trustlist.c:248
+#: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:280
+#: agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: agent/trustlist.c:381 agent/trustlist.c:420
+#: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -573,7 +584,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:496
+#: agent/trustlist.c:507
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -583,7 +594,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:505
+#: agent/trustlist.c:516
 msgid "Correct"
 msgstr ""
 
@@ -595,58 +606,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:525
+#: agent/trustlist.c:536
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 #, fuzzy
 msgid "Yes"
 msgstr "si|sim"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:393
+#: common/exechelp.c:302 common/exechelp.c:390
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: common/exechelp.c:369 common/exechelp.c:426
+#: common/exechelp.c:366 common/exechelp.c:423
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "non se puido abrir un ficheiro: %s\n"
 
-#: common/exechelp.c:405 common/exechelp.c:635
+#: common/exechelp.c:402 common/exechelp.c:632
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: common/exechelp.c:461 common/exechelp.c:504
+#: common/exechelp.c:458 common/exechelp.c:501
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:469
+#: common/exechelp.c:466
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: common/exechelp.c:475 common/exechelp.c:515
+#: common/exechelp.c:472 common/exechelp.c:512
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: common/exechelp.c:510
+#: common/exechelp.c:507
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:521
+#: common/exechelp.c:518
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "erro lendo `%s': %s\n"
@@ -665,26 +676,26 @@ msgstr "%s: usuario non atopado\n"
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: common/simple-pwquery.c:376
+#: common/simple-pwquery.c:373
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "non se puido conectar a `%s': %s\n"
 
-#: common/simple-pwquery.c:387
+#: common/simple-pwquery.c:384
 msgid "communication problem with gpg-agent\n"
 msgstr "problema de comunicaci�n con gpg-agent\n"
 
-#: common/simple-pwquery.c:397
+#: common/simple-pwquery.c:394
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
 
-#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+#: common/simple-pwquery.c:557 common/simple-pwquery.c:653
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "cancelado polo usuario\n"
 
-#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+#: common/simple-pwquery.c:572 common/simple-pwquery.c:659
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
@@ -866,7 +877,7 @@ msgstr "AVISO: atop�ronse datos de notaci�n non v�lidos\n"
 msgid "not human readable"
 msgstr "non lexible por humanos"
 
-#: g10/card-util.c:62 g10/card-util.c:305
+#: g10/card-util.c:62 g10/card-util.c:308
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "a chave secreta non est� dispo�ible"
@@ -876,166 +887,166 @@ msgstr "a chave secreta non est� dispo�ible"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1391 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
 #, 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:102 g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
 #: g10/keygen.c:1644
 msgid "Your selection? "
 msgstr "�A s�a selecci�n? "
 
-#: g10/card-util.c:215 g10/card-util.c:265
+#: g10/card-util.c:218 g10/card-util.c:268
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:412
+#: g10/card-util.c:415
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 #, fuzzy
 msgid "unspecified"
 msgstr "Non se especificou un motivo"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 #, fuzzy
 msgid "not forced"
 msgstr "non procesado"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:521
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:523
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:525
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:539
+#: g10/card-util.c:542
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:544
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:562
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:580
+#: g10/card-util.c:583
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "non hai unha chave p�blica correspondente: %s\n"
 
-#: g10/card-util.c:588
+#: g10/card-util.c:591
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
+#: g10/card-util.c:689 g10/card-util.c:758 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/card-util.c:694
+#: g10/card-util.c:697
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:704
+#: g10/card-util.c:707
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:763
+#: g10/card-util.c:766
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:773
+#: g10/card-util.c:776
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:793
+#: g10/card-util.c:796
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferencias actualizadas"
 
-#: g10/card-util.c:801
+#: g10/card-util.c:804
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:813
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/card-util.c:831
+#: g10/card-util.c:834
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:845
+#: g10/card-util.c:848
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: g10/card-util.c:866
+#: g10/card-util.c:869
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Pegada dactilar:"
 
-#: g10/card-util.c:889
+#: g10/card-util.c:892
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: g10/card-util.c:937
+#: g10/card-util.c:940
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:941
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: g10/card-util.c:947
+#: g10/card-util.c:950
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/card-util.c:1031
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1051 g10/card-util.c:1060
+#: g10/card-util.c:1054 g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1075
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1084
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1043,136 +1054,136 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1115
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/card-util.c:1117 g10/card-util.c:1194
+#: g10/card-util.c:1120 g10/card-util.c:1197
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/card-util.c:1118 g10/card-util.c:1196
+#: g10/card-util.c:1121 g10/card-util.c:1199
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1198
+#: g10/card-util.c:1122 g10/card-util.c:1201
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1135 g10/card-util.c:1214 g10/keyedit.c:945
+#: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
 #: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Selecci�n non v�lida.\n"
 
-#: g10/card-util.c:1191
+#: g10/card-util.c:1194
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Por favor, escolla o motivo da revocaci�n:\n"
 
-#: g10/card-util.c:1226
+#: g10/card-util.c:1229
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de protecci�n desco�ecido\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1234
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1239
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/card-util.c:1304 g10/keyedit.c:1362
+#: g10/card-util.c:1307 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "sa�r deste men�"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1309
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1307 g10/keyedit.c:1365
+#: g10/card-util.c:1310 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "amosar esta axuda"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1312
 #, fuzzy
 msgid "list all available data"
 msgstr "Chave dispo�ible en: "
 
-#: g10/card-util.c:1312
+#: g10/card-util.c:1315
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1313
+#: g10/card-util.c:1316
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1317
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1315
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia-la fecha de expiraci�n"
 
-#: g10/card-util.c:1316
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1320
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1322
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1323
 #, fuzzy
 msgid "generate new keys"
 msgstr "xerar un novo par de chaves"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1324
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1325
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442 g10/keyedit.c:1634
+#: g10/card-util.c:1445 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1480
+#: g10/card-util.c:1483
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1511
+#: g10/card-util.c:1514
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1513
+#: g10/card-util.c:1516
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/card-util.c:1587 g10/keyedit.c:2255
+#: g10/card-util.c:1590 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
@@ -1180,7 +1191,7 @@ msgstr "Comando incorrecto (tente \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "non se puido abrir `%s'\n"
@@ -1492,7 +1503,7 @@ msgstr "empr�gase a chave secundaria %08lX no canto da primaria %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sen chave p�blica - omitida\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1508,27 +1519,27 @@ msgstr "|[ficheiro]|facer unha sinatura"
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: g10/gpg.c:372 sm/gpgsm.c:244
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "cifrar datos"
 
-#: g10/gpg.c:375 sm/gpgsm.c:246
+#: g10/gpg.c:375 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar s� con cifrado sim�trico"
 
-#: g10/gpg.c:377 sm/gpgsm.c:247
+#: g10/gpg.c:377 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "descifrar datos (por defecto)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:248
+#: g10/gpg.c:379 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "verificar unha sinatura"
 
-#: g10/gpg.c:381 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "ve-la lista de chaves"
 
@@ -1541,11 +1552,11 @@ msgstr "ve-la lista de chaves e sinaturas"
 msgid "list and check key signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/gpg.c:385 sm/gpgsm.c:254
+#: g10/gpg.c:385 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#: g10/gpg.c:386 sm/gpgsm.c:252
+#: g10/gpg.c:386 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "ve-la lista de chaves secretas"
 
@@ -1581,11 +1592,11 @@ msgstr "xerar un certificado de revocaci�n"
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:397 sm/gpgsm.c:257
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "importar chaves dun servidor de chaves"
 
@@ -1621,11 +1632,11 @@ msgstr "actualiza-la base de datos de confianza"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/gpg.c:430 sm/gpgsm.c:262
+#: g10/gpg.c:430 sm/gpgsm.c:264
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
 #: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1636,31 +1647,31 @@ msgstr ""
 "Opci�ns:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:279
+#: g10/gpg.c:434 sm/gpgsm.c:281
 msgid "create ascii armored output"
 msgstr "crear sa�da con armadura en ascii"
 
-#: g10/gpg.c:436 sm/gpgsm.c:291
+#: g10/gpg.c:436 sm/gpgsm.c:293
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:447 sm/gpgsm.c:327
+#: g10/gpg.c:447 sm/gpgsm.c:331
 msgid "use this user-id to sign or decrypt"
 msgstr "empregar este id de usuario para asinar ou descifrar"
 
-#: g10/gpg.c:448 sm/gpgsm.c:330
+#: g10/gpg.c:448 sm/gpgsm.c:334
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|axusta-lo nivel de compresi�n a N (0 desactiva)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:332
+#: g10/gpg.c:453 sm/gpgsm.c:336
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "usar coma ficheiro de sa�da"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "non facer ning�n cambio"
 
@@ -1676,7 +1687,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:393
+#: g10/gpg.c:553 sm/gpgsm.c:397
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1684,7 +1695,7 @@ msgstr ""
 "@\n"
 "(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:396
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1724,7 +1735,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:532
+#: g10/gpg.c:781 sm/gpgsm.c:538
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1752,7 +1763,7 @@ msgstr "Compresi�n: "
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:669
+#: g10/gpg.c:1045 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
@@ -1828,464 +1839,464 @@ msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: 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:1548
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1554
+#: 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:1556
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1562
+#: 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:1564
+#: 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:1827
+#: g10/gpg.c:1825
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1981
 #, 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:2243 g10/gpg.c:2884 g10/gpg.c:2896
+#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s non � para uso normal!\n"
 
-#: g10/gpg.c:2401 g10/gpg.c:2413
+#: g10/gpg.c:2399 g10/gpg.c:2411
 #, 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:2495
+#: g10/gpg.c:2493
 #, 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:2518 g10/gpg.c:2713 g10/keyedit.c:4084
+#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2528
 #, 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:2533
+#: g10/gpg.c:2531
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2538
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2541
 msgid "invalid import options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2548
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2551
 msgid "invalid export options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2558
 #, 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:2563
+#: g10/gpg.c:2561
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2569
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2571
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2573
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2575
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2579
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2581
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2585
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2587
 #, 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
+#: g10/gpg.c:2589
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2591
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2598
 #, 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:2603
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2608
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2782
 #, 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:2787
+#: g10/gpg.c:2785
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2873 sm/gpgsm.c:1220
+#: g10/gpg.c:2871 sm/gpgsm.c:1247
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2875
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2884
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2887
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2902
 #, 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:2918
+#: g10/gpg.c:2916
 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:2924
+#: g10/gpg.c:2922
 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:2930
+#: g10/gpg.c:2928
 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:2943
+#: g10/gpg.c:2941
 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:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
+#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1303
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
+#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1311
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3025
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3040
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3042
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3044
 #, 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:3048
+#: g10/gpg.c:3046
 #, 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:3050
+#: g10/gpg.c:3048
 #, 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:3053
+#: g10/gpg.c:3051
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/gpg.c:3057
+#: g10/gpg.c:3055
 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:3064
+#: g10/gpg.c:3062
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non v�lidas\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3071
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non v�lidas\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3075
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non v�lidas\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3079
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresi�n personais non v�lidas\n"
 
-#: g10/gpg.c:3114
+#: g10/gpg.c:3112
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�%s a�nda non traballa con %s!\n"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3159
 #, 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:3166
+#: g10/gpg.c:3164
 #, 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:3171
+#: g10/gpg.c:3169
 #, 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:3263
+#: g10/gpg.c:3261
 #, 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:3274
+#: g10/gpg.c:3272
 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:3295
+#: g10/gpg.c:3293
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3300
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3302
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3312
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3325
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3327
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3332
+#: g10/gpg.c:3330
 #, 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:3350
+#: g10/gpg.c:3348
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3361
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3376
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3378
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3381
 #, 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:3403
+#: g10/gpg.c:3401
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3410
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3435
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3443
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3447
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3468
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3553
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3557
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportaci�n da chave fallou: %s\n"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3568
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/gpg.c:3580
+#: g10/gpg.c:3578
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3631
+#: g10/gpg.c:3629
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/gpg.c:3639
+#: g10/gpg.c:3637
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/gpg.c:3729
+#: g10/gpg.c:3727
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3844
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/gpg.c:3850
+#: g10/gpg.c:3848
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a s�a mensaxe ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4160
 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:4162
 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:4195
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
@@ -2298,7 +2309,7 @@ msgstr "toma-las chaves deste chaveiro"
 msgid "make timestamp conflicts only a warning"
 msgstr "converte-los conflictos de selo de data nun aviso"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:368
+#: g10/gpgv.c:75 sm/gpgsm.c:372
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribi-la informaci�n de estado a este DF"
 
@@ -6777,64 +6788,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: scd/scdaemon.c:105
+#: scd/scdaemon.c:108
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:357
+#: scd/scdaemon.c:114 sm/gpgsm.c:361
 #, fuzzy
 msgid "read options from file"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:124
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:129
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "non usa-la terminal en absoluto"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:134
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:135
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "comandos conflictivos\n"
 
-#: scd/scdaemon.c:206
+#: scd/scdaemon.c:209
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: scd/scdaemon.c:208
+#: scd/scdaemon.c:211
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:671
+#: scd/scdaemon.c:658
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1019
+#: scd/scdaemon.c:1006
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1024
+#: scd/scdaemon.c:1011
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6863,152 +6874,269 @@ msgstr "a versi�n %d do protocolo de gpg-agent non est� soportada\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:174
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr ""
+
+#: sm/certchain.c:195
+msgid "chain"
+msgstr ""
+
+#: sm/certchain.c:196
+#, fuzzy
+msgid "shell"
+msgstr "axuda"
+
+#: sm/certchain.c:241
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "a versi�n %d do protocolo de gpg-agent non est� soportada\n"
 
-#: sm/certchain.c:212
+#: sm/certchain.c:279
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:250
+#: sm/certchain.c:317
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:260
+#: sm/certchain.c:327
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: sm/certchain.c:267 sm/certchain.c:296
+#: sm/certchain.c:334 sm/certchain.c:363
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:271 sm/certchain.c:300
+#: sm/certchain.c:338 sm/certchain.c:367
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: sm/certchain.c:411
+#: sm/certchain.c:478
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:431
+#: sm/certchain.c:498
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: sm/certchain.c:675
+#: sm/certchain.c:742
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: a chave est� revocada"
 
-#: sm/certchain.c:684
+#: sm/certchain.c:752
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Certificado correcto"
 
-#: sm/certchain.c:688
+#: sm/certchain.c:757
+msgid "the status of the certificate is unknown"
+msgstr ""
+
+#: sm/certchain.c:762
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Chave dispo�ible en: "
 
-#: sm/certchain.c:690
+#: sm/certchain.c:764
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:695
+#: sm/certchain.c:770
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
 
-#: sm/certchain.c:791
-#, fuzzy
-msgid "no issuer found in certificate"
-msgstr "Certificado correcto"
-
-#: sm/certchain.c:820
+#: sm/certchain.c:799 sm/certchain.c:867
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "problema de lectura do certificado: %s\n"
 
-#: sm/certchain.c:836
+#: sm/certchain.c:814 sm/certchain.c:899
 #, fuzzy
 msgid "certificate not yet valid"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:849
+#: sm/certchain.c:815 sm/certchain.c:900
+#, fuzzy
+msgid "root certificate not yet valid"
+msgstr "Revocaci�n de certificado v�lida"
+
+#: sm/certchain.c:816 sm/certchain.c:901
+#, fuzzy
+msgid "intermediate certificate not yet valid"
+msgstr "Revocaci�n de certificado v�lida"
+
+#: sm/certchain.c:829
 #, fuzzy
 msgid "certificate has expired"
 msgstr "problema de lectura do certificado: %s\n"
 
-#: sm/certchain.c:892
-msgid "self-signed certificate has a BAD signature"
+#: sm/certchain.c:830
+#, fuzzy
+msgid "root certificate has expired"
+msgstr "problema de lectura do certificado: %s\n"
+
+#: sm/certchain.c:831
+#, fuzzy
+msgid "intermediate certificate has expired"
+msgstr "problema de lectura do certificado: %s\n"
+
+#: sm/certchain.c:873
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:960
+#: sm/certchain.c:882
 #, fuzzy
-msgid "root certificate is not marked trusted"
+msgid "certificate with invalid validity"
+msgstr "problema de lectura do certificado: %s\n"
+
+#: sm/certchain.c:919
+msgid "signature not created during lifetime of certificate"
+msgstr ""
+
+#: sm/certchain.c:921
+msgid "certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:922
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:926
+#, fuzzy
+msgid "  (  signature created at "
+msgstr "         novas sinaturas: %lu\n"
+
+#: sm/certchain.c:927
+#, fuzzy
+msgid "  (certificate created at "
+msgstr "Creouse o certificado de revocaci�n.\n"
+
+#: sm/certchain.c:930
+#, fuzzy
+msgid "  (certificate valid from "
+msgstr "Revocaci�n de certificado v�lida"
+
+#: sm/certchain.c:931
+msgid "  (     issuer valid from "
 msgstr ""
-"Non se atoparon certificados con confianza non definida.\n"
-"\n"
 
-#: sm/certchain.c:975
+#: sm/certchain.c:961
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Pegada dactilar:"
 
-#: sm/certchain.c:983
+#: sm/certchain.c:970
 #, fuzzy
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 "Non se atoparon certificados con confianza non definida.\n"
 "\n"
 
-#: sm/certchain.c:998
+#: sm/certchain.c:983
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1004
+#: sm/certchain.c:989
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1046
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr ""
+
+#: sm/certchain.c:1110
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "Certificado correcto"
+
+#: sm/certchain.c:1184
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:1253
+#, fuzzy
+msgid "root certificate is not marked trusted"
+msgstr ""
+"Non se atoparon certificados con confianza non definida.\n"
+"\n"
+
+#: sm/certchain.c:1266
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
 
-#: sm/certchain.c:1041 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:157
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:1053
+#: sm/certchain.c:1307
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:1086
+#: sm/certchain.c:1340
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verificar unha sinatura"
 
-#: sm/certchain.c:1116
+#: sm/certchain.c:1371
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1167
+#: sm/certchain.c:1422
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
+#: sm/certchain.c:1462 sm/certchain.c:1730
+#, fuzzy
+msgid "certificate is good\n"
+msgstr "Revocaci�n de certificado v�lida"
+
+#: sm/certchain.c:1463
+#, fuzzy
+msgid "intermediate certificate is good\n"
+msgstr "certificado duplicado - borrado"
+
+#: sm/certchain.c:1464
+#, fuzzy
+msgid "root certificate is good\n"
+msgstr ""
+"Non se atoparon certificados con confianza non definida.\n"
+"\n"
+
+#: sm/certchain.c:1620
+msgid "switching to chain model"
+msgstr ""
+
+#: sm/certchain.c:1629
+#, c-format
+msgid "validation model used: %s"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "chain model"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "shell model"
+msgstr ""
+
 #: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
@@ -7056,7 +7184,7 @@ msgstr "erro: pegada dactilar non v�lida\n"
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
 "\"%s\"\n"
-"S/N %s, ID %08lX, created %s"
+"S/N %s, ID 0x%08lX, created %s"
 msgstr ""
 "Precisa un contrasinal para desbloquea-la chave secreta do usuario:\n"
 "\"%.*s\"\n"
@@ -7066,7 +7194,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:131 sm/keylist.c:255
+#: sm/certlist.c:131 sm/keylist.c:258
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
@@ -7188,181 +7316,181 @@ msgstr "erro ao crea-lo contrasinal: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "escribindo a `%s'\n"
 
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[ficheiro]|facer unha sinatura"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: sm/gpgsm.c:251
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list external keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/gpgsm.c:256
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "borrar chaves do chaveiro p�blico"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:262
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:268
 #, fuzzy
 msgid "change a passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crear sa�da con armadura en ascii"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:287
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:296
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:302
+#: sm/gpgsm.c:304
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:305
+#: sm/gpgsm.c:309
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:312
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:315
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:319
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:323
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:325
 msgid "use the default key as default recipient"
 msgstr "usa-la chave por defecto coma o destinatario por defecto"
 
-#: sm/gpgsm.c:338
+#: sm/gpgsm.c:342
 msgid "don't use the terminal at all"
 msgstr "non usa-la terminal en absoluto"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:346
 msgid "force v3 signatures"
 msgstr "forzar sinaturas v3"
 
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:347
 msgid "always use a MDC for encryption"
 msgstr "sempre usar un MDC para cifrar"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:352
 msgid "batch mode: never ask"
 msgstr "modo por lotes: non preguntar nunca"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:353
 msgid "assume yes on most questions"
 msgstr "asumir `si' na maior�a das preguntas"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:354
 msgid "assume no on most questions"
 msgstr "asumir `non' na maior�a das preguntas"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:356
 msgid "add this keyring to the list of keyrings"
 msgstr "engadir este chaveiro � lista de chaveiros"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:357
 msgid "add this secret keyring to the list"
 msgstr "engadir este chaveiro secreto � lista"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|empregar NOME coma chave secreta por defecto"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:359
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:360
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|axusta-lo xogo de caracteres do terminal a NOME"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:364
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:375
+#: sm/gpgsm.c:379
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
 
-#: sm/gpgsm.c:381
+#: sm/gpgsm.c:385
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:387
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de resumos de mensaxes NOME"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:389
 msgid "|N|use compress algorithm N"
 msgstr "|N|emprega-lo algoritmo de compresi�n N"
 
-#: sm/gpgsm.c:522
+#: sm/gpgsm.c:528
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: sm/gpgsm.c:525
+#: sm/gpgsm.c:531
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7373,31 +7501,36 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: sm/gpgsm.c:604
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: sm/gpgsm.c:685
+#: sm/gpgsm.c:691
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "non se puido conectar a `%s': %s\n"
 
-#: sm/gpgsm.c:1237
+#: sm/gpgsm.c:713
+#, fuzzy, c-format
+msgid "unknown validation model `%s'\n"
+msgstr "destinatario por defecto `%s' desco�ecido\n"
+
+#: sm/gpgsm.c:1264
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1316
+#: sm/gpgsm.c:1344
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: sm/gpgsm.c:1334
+#: sm/gpgsm.c:1362
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: sm/gpgsm.c:1529
+#: sm/gpgsm.c:1543
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7420,7 +7553,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:375
+#: sm/import.c:541 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro lendo `%s': %s\n"
@@ -7504,7 +7637,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234
+#: sm/qualified.c:234 sm/verify.c:536
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7523,30 +7656,37 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
 
-#: sm/verify.c:386
+#: sm/verify.c:388
 #, fuzzy
 msgid "Signature made "
 msgstr "A sinatura caducou o %s\n"
 
-#: sm/verify.c:390
+#: sm/verify.c:392
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:391
-#, c-format
-msgid " using certificate ID %08lX\n"
-msgstr ""
+#: sm/verify.c:393
+#, fuzzy, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: sm/verify.c:507
+#: sm/verify.c:514
 #, fuzzy
 msgid "Good signature from"
 msgstr "Sinatura correcta de \""
 
-#: sm/verify.c:508
+#: sm/verify.c:515
 #, fuzzy
 msgid "                aka"
 msgstr "               alias \""
 
+#: sm/verify.c:533
+#, fuzzy
+msgid "This is a qualified signature\n"
+msgstr ""
+"\n"
+"Esta ha ser unha auto-sinatura.\n"
+
 #: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
@@ -7583,133 +7723,138 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:315
+#: tools/gpg-connect-agent.c:314
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:323
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:382
+#: tools/gpg-connect-agent.c:381
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "li�a longa de m�is\n"
 
-#: tools/gpg-connect-agent.c:386
+#: tools/gpg-connect-agent.c:385
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:458
+#: tools/gpg-connect-agent.c:457
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
 
-#: tools/gpg-connect-agent.c:466
+#: tools/gpg-connect-agent.c:465
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: tools/gpg-connect-agent.c:474
+#: tools/gpg-connect-agent.c:473
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: tools/gpg-connect-agent.c:784
+#: tools/gpg-connect-agent.c:789
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:793
+#: tools/gpg-connect-agent.c:798
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
+#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
-#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
+#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "habilitar depuraci�n total"
 
-#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
-#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:501
+#: tools/gpgconf-comp.c:492
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:505
+#: tools/gpgconf-comp.c:496
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:509
+#: tools/gpgconf-comp.c:500
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:510
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:638
+#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#, fuzzy
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NOME|cifrar para NOME"
+
+#: tools/gpgconf-comp.c:635
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:640
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME para os contrasinais"
 
-#: tools/gpgconf-comp.c:705
+#: tools/gpgconf-comp.c:708
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:749
+#: tools/gpgconf-comp.c:752
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:785
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:806
+#: tools/gpgconf-comp.c:809
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:814
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:848
+#: tools/gpgconf-comp.c:851
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2681
+#: tools/gpgconf-comp.c:2684
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8342,9 +8487,6 @@ msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 #~ msgid "q"
 #~ msgstr "s"
 
-#~ msgid "help"
-#~ msgstr "axuda"
-
 #~ msgid "list"
 #~ msgstr "listar"
 
diff --git a/po/hu.po b/po/hu.po
index 87c8ca646..c78e67331 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-07-05 18:01+0200\n"
+"POT-Creation-Date: 2007-08-10 15:49+0200\n"
 "PO-Revision-Date: 2004-06-19 21:53+0200\n"
 "Last-Translator: Nagy Ferenc L�szl� <nfl@nfllab.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -19,54 +19,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: agent/call-pinentry.c:426
+#: agent/call-pinentry.c:436
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:429
+#: agent/call-pinentry.c:439
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: agent/call-pinentry.c:476
+#: agent/call-pinentry.c:486
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
+#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
 #, fuzzy
 msgid "PIN too long"
 msgstr "A sor t�l hossz�!\n"
 
-#: agent/call-pinentry.c:497
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "A jelsz� t�l hossz�!\n"
 
-#: agent/call-pinentry.c:505
+#: agent/call-pinentry.c:515
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "�rv�nytelen karakter a n�vben!\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:520
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:522
+#: agent/call-pinentry.c:532
 #, fuzzy
 msgid "Bad PIN"
 msgstr "hib�s MPI"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:533
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "rossz jelsz�"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:569
 #, fuzzy
 msgid "Passphrase"
 msgstr "rossz jelsz�"
@@ -83,14 +83,14 @@ msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 msgid "can't create `%s': %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
 #: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
-#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1796
+#: sm/gpgsm.c:1833 sm/gpgsm.c:1871 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
@@ -177,35 +177,46 @@ msgstr[1] ""
 msgid "Take this one anyway"
 msgstr "M�gis haszn�ljuk ezt a kulcsot? "
 
-#: agent/genkey.c:99
+#: agent/genkey.c:99 agent/genkey.c:114
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "�rja be a jelsz�t!\n"
 
-#: agent/genkey.c:144
+#: agent/genkey.c:107
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+
+#: agent/genkey.c:113
+msgid "Yes, protection is not needed"
+msgstr ""
+
+#: agent/genkey.c:158
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Most sz�ks�g van egy jelsz�ra (vagy mondatra), amely a titkos kulcs�t v�di.\n"
 "\n"
 
-#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
+#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
 #: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:263
+#: agent/genkey.c:280
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -215,247 +226,247 @@ msgstr ""
 "Opci�k:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:103
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
-#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
 #: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "b�besz�d� m�d"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
-#: sm/gpgsm.c:337
+#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "m�g sz�kszav�bb m�d"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:109
+#: agent/gpg-agent.c:118 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|f�jl|b�v�t� modul bet�lt�se"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:119
+#: agent/gpg-agent.c:125 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:125
+#: agent/gpg-agent.c:126
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "kulcsok keres�se kulcsszerveren"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:129
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "bizalmi adatb�zis friss�t�se"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:145
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:206 sm/gpgsm.c:525 tools/gpg-connect-agent.c:124
 #: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "A hib�kat (angolul) a <gnupg-bugs@gnu.org> c�mre �rja meg!\n"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:262
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
+#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
-#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:340 sm/gpgsm.c:772 sm/gpgsm.c:775 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
+#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:863
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MEGJEGYZ�S: Nincs alap�rtelmezett opci�s f�jl (%s).\n"
 
-#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
-#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: scd/scdaemon.c:421 sm/gpgsm.c:867 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "\"%s\" opci�s f�jl: %s\n"
 
-#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
+#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:874
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
 
-#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
-#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:921
+#: agent/gpg-agent.c:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
+#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:908
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "Nem tudom a \"%s\" k�nyvt�rat l�trehozni: %s.\n"
 
-#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
+#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
-#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
+#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
 
-#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
+#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
+#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: K�nyvt�rat l�trehoztam.\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1377
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "Bizalmi adatb�zis: olvas�s sikertelen (n=%d): %s.\n"
 
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1381
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: Nem tudom a k�nyvt�rat l�trehozni: %s.\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1497
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1519
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
+#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
 
-#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
+#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: kihagyva: %s\n"
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1752
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
-#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:751
+#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "Nem megfelel� form�j� GPG_AGENT_INFO k�rnyezeti v�ltoz�!\n"
 
-#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
-#: tools/gpg-connect-agent.c:762
+#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
@@ -520,42 +531,42 @@ msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 msgid "cancelled\n"
 msgstr "M�gsem"
 
-#: agent/trustlist.c:131 agent/trustlist.c:319
+#: agent/trustlist.c:132 agent/trustlist.c:322
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: agent/trustlist.c:146
+#: agent/trustlist.c:147
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: agent/trustlist.c:166 agent/trustlist.c:174
+#: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:180
+#: agent/trustlist.c:181
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "Titkos kulcsr�szek nem �llnak rendelkez�sre.\n"
 
-#: agent/trustlist.c:215
+#: agent/trustlist.c:216
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "Olvas�si hiba: %s.\n"
 
-#: agent/trustlist.c:241 agent/trustlist.c:248
+#: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:280
+#: agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: agent/trustlist.c:381 agent/trustlist.c:420
+#: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -568,7 +579,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:496
+#: agent/trustlist.c:507
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -578,7 +589,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:505
+#: agent/trustlist.c:516
 msgid "Correct"
 msgstr ""
 
@@ -590,58 +601,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:525
+#: agent/trustlist.c:536
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 #, fuzzy
 msgid "Yes"
 msgstr "igen"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:393
+#: common/exechelp.c:302 common/exechelp.c:390
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: common/exechelp.c:369 common/exechelp.c:426
+#: common/exechelp.c:366 common/exechelp.c:423
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
 
-#: common/exechelp.c:405 common/exechelp.c:635
+#: common/exechelp.c:402 common/exechelp.c:632
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: common/exechelp.c:461 common/exechelp.c:504
+#: common/exechelp.c:458 common/exechelp.c:501
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:469
+#: common/exechelp.c:466
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: common/exechelp.c:475 common/exechelp.c:515
+#: common/exechelp.c:472 common/exechelp.c:512
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: common/exechelp.c:510
+#: common/exechelp.c:507
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:521
+#: common/exechelp.c:518
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
@@ -660,26 +671,26 @@ msgstr "[ismeretlen kulcs]"
 msgid "gpg-agent is not available in this session\n"
 msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
-#: common/simple-pwquery.c:376
+#: common/simple-pwquery.c:373
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
 
-#: common/simple-pwquery.c:387
+#: common/simple-pwquery.c:384
 msgid "communication problem with gpg-agent\n"
 msgstr "Kommunik�ci�s probl�ma a gpg �gyn�kkel!\n"
 
-#: common/simple-pwquery.c:397
+#: common/simple-pwquery.c:394
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
 
-#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+#: common/simple-pwquery.c:557 common/simple-pwquery.c:653
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "A felhaszn�l� megszak�totta a m�veletet.\n"
 
-#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+#: common/simple-pwquery.c:572 common/simple-pwquery.c:659
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
@@ -860,7 +871,7 @@ msgstr "FIGYELEM: �rv�nytelen jel�l� adatot tal�ltam.\n"
 msgid "not human readable"
 msgstr "nem olvashat� forma"
 
-#: g10/card-util.c:62 g10/card-util.c:305
+#: g10/card-util.c:62 g10/card-util.c:308
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "titkos kulcs nem �ll rendelkez�sre"
@@ -870,166 +881,166 @@ msgstr "titkos kulcs nem �ll rendelkez�sre"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1391 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
 #, 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:102 g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
 #: g10/keygen.c:1644
 msgid "Your selection? "
 msgstr "Mit v�laszt? "
 
-#: g10/card-util.c:215 g10/card-util.c:265
+#: g10/card-util.c:218 g10/card-util.c:268
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:412
+#: g10/card-util.c:415
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 #, fuzzy
 msgid "unspecified"
 msgstr "Nincs megadva ok."
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 #, fuzzy
 msgid "not forced"
 msgstr "nem feldolgozott"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:521
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:523
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:525
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:539
+#: g10/card-util.c:542
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:544
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:562
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:580
+#: g10/card-util.c:583
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "Nincs hozz� tartoz� nyilv�nos kulcs: %s\n"
 
-#: g10/card-util.c:588
+#: g10/card-util.c:591
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
+#: g10/card-util.c:689 g10/card-util.c:758 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: g10/card-util.c:694
+#: g10/card-util.c:697
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:704
+#: g10/card-util.c:707
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:763
+#: g10/card-util.c:766
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:773
+#: g10/card-util.c:776
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:793
+#: g10/card-util.c:796
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenci�k friss�t�se"
 
-#: g10/card-util.c:801
+#: g10/card-util.c:804
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:813
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/card-util.c:831
+#: g10/card-util.c:834
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:845
+#: g10/card-util.c:848
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:866
+#: g10/card-util.c:869
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:889
+#: g10/card-util.c:892
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:937
+#: g10/card-util.c:940
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:941
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 
-#: g10/card-util.c:947
+#: g10/card-util.c:950
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: g10/card-util.c:1031
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1051 g10/card-util.c:1060
+#: g10/card-util.c:1054 g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1075
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1084
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1037,136 +1048,136 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1115
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
 
-#: g10/card-util.c:1117 g10/card-util.c:1194
+#: g10/card-util.c:1120 g10/card-util.c:1197
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/card-util.c:1118 g10/card-util.c:1196
+#: g10/card-util.c:1121 g10/card-util.c:1199
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1198
+#: g10/card-util.c:1122 g10/card-util.c:1201
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1135 g10/card-util.c:1214 g10/keyedit.c:945
+#: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
 #: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "�rv�nytelen v�laszt�s.\n"
 
-#: g10/card-util.c:1191
+#: g10/card-util.c:1194
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
 
-#: g10/card-util.c:1226
+#: g10/card-util.c:1229
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "Ismeretlen v�delmi algoritmus!\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1234
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1239
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/card-util.c:1304 g10/keyedit.c:1362
+#: g10/card-util.c:1307 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "kil�p�s ebb�l a men�b�l"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1309
 #, fuzzy
 msgid "show admin commands"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1307 g10/keyedit.c:1365
+#: g10/card-util.c:1310 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "megmutatja ezt a s�g�t"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1312
 #, fuzzy
 msgid "list all available data"
 msgstr "Kulcs tal�lhat�: "
 
-#: g10/card-util.c:1312
+#: g10/card-util.c:1315
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1313
+#: g10/card-util.c:1316
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1317
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1315
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "change the login name"
 msgstr "lej�rat megv�ltoztat�sa"
 
-#: g10/card-util.c:1316
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "change the language preferences"
 msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1320
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1322
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1323
 #, fuzzy
 msgid "generate new keys"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1324
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1325
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442 g10/keyedit.c:1634
+#: g10/card-util.c:1445 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Parancs> "
 
-#: g10/card-util.c:1480
+#: g10/card-util.c:1483
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1511
+#: g10/card-util.c:1514
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1513
+#: g10/card-util.c:1516
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/card-util.c:1587 g10/keyedit.c:2255
+#: g10/card-util.c:1590 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 
@@ -1174,7 +1185,7 @@ msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
@@ -1481,7 +1492,7 @@ msgstr "A %08lX m�sodlagos kulcsot haszn�ljuk a %08lX els�dleges helyett.\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "%08lX kulcs: titkos kulcs nyilv�nos kulcs n�lk�l - kihagytam.\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1497,27 +1508,27 @@ msgstr "|[f�jl]|al��r�s k�sz�t�se"
 msgid "|[file]|make a clear text signature"
 msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
 
-#: g10/gpg.c:372 sm/gpgsm.c:244
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "k�l�n�ll� al��r�s k�sz�t�se"
 
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "adat titkos�t�sa"
 
-#: g10/gpg.c:375 sm/gpgsm.c:246
+#: g10/gpg.c:375 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "titkos�t�s csak szimmetrikus rejtjelez�vel"
 
-#: g10/gpg.c:377 sm/gpgsm.c:247
+#: g10/gpg.c:377 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "adat visszafejt�se (alap�rtelmez�s)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:248
+#: g10/gpg.c:379 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "al��r�s ellen�rz�se"
 
-#: g10/gpg.c:381 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "kulcsok list�z�sa"
 
@@ -1530,11 +1541,11 @@ msgstr "kulcsok �s al��r�sok list�z�sa"
 msgid "list and check key signatures"
 msgstr "kulcsal��r�sok ellen�rz�se"
 
-#: g10/gpg.c:385 sm/gpgsm.c:254
+#: g10/gpg.c:385 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "kulcsok �s ujjlenyomatok list�z�sa"
 
-#: g10/gpg.c:386 sm/gpgsm.c:252
+#: g10/gpg.c:386 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "titkos kulcsok list�z�sa"
 
@@ -1570,11 +1581,11 @@ msgstr "visszavon�si igazol�s k�sz�t�se"
 msgid "export keys"
 msgstr "kulcsok export�l�sa"
 
-#: g10/gpg.c:397 sm/gpgsm.c:257
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "kulcsok export�l�sa kulcsszerverre"
 
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "kulcsok import�l�sa kulcsszerverr�l"
 
@@ -1610,11 +1621,11 @@ msgstr "bizalmi adatb�zis friss�t�se"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
 
-#: g10/gpg.c:430 sm/gpgsm.c:262
+#: g10/gpg.c:430 sm/gpgsm.c:264
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
 #: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1625,31 +1636,31 @@ msgstr ""
 "Opci�k:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:279
+#: g10/gpg.c:434 sm/gpgsm.c:281
 msgid "create ascii armored output"
 msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
 
-#: g10/gpg.c:436 sm/gpgsm.c:291
+#: g10/gpg.c:436 sm/gpgsm.c:293
 msgid "|NAME|encrypt for NAME"
 msgstr "|N�V|titkos�t�s N�V r�sz�re"
 
-#: g10/gpg.c:447 sm/gpgsm.c:327
+#: g10/gpg.c:447 sm/gpgsm.c:331
 msgid "use this user-id to sign or decrypt"
 msgstr "felh. azonos�t� al��r�shoz �s visszafejt�shez"
 
-#: g10/gpg.c:448 sm/gpgsm.c:330
+#: g10/gpg.c:448 sm/gpgsm.c:334
 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:453 sm/gpgsm.c:332
+#: g10/gpg.c:453 sm/gpgsm.c:336
 msgid "use canonical text mode"
 msgstr "kanonikus sz�veges m�d haszn�lata"
 
-#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "kimeneti �llom�ny megad�sa"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "ne csin�ljon semmi v�ltoztat�st"
 
@@ -1665,7 +1676,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:393
+#: g10/gpg.c:553 sm/gpgsm.c:397
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1673,7 +1684,7 @@ msgstr ""
 "@\n"
 "(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:396
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1711,7 +1722,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:781 sm/gpgsm.c:532
+#: g10/gpg.c:781 sm/gpgsm.c:538
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1739,7 +1750,7 @@ msgstr "T�m�r�t� (compression): "
 msgid "usage: gpg [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:669
+#: g10/gpg.c:1045 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
@@ -1815,462 +1826,462 @@ msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: 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:1548
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1554
+#: 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:1556
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1562
+#: 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:1564
+#: 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:1827
+#: g10/gpg.c:1825
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1981
 #, 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:2243 g10/gpg.c:2884 g10/gpg.c:2896
+#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
 #, 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:2401 g10/gpg.c:2413
+#: g10/gpg.c:2399 g10/gpg.c:2411
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2493
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4084
+#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2528
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2531
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2538
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2541
 msgid "invalid import options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2548
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2551
 msgid "invalid export options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2558
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2561
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2569
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2571
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2573
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2575
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2579
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2581
 #, 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:2585
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2585
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2587
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2589
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2591
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2598
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2608
 #, 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:2784
+#: g10/gpg.c:2782
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2787
+#: g10/gpg.c:2785
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2873 sm/gpgsm.c:1220
+#: g10/gpg.c:2871 sm/gpgsm.c:1247
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2875
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2884
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2887
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �rtelmetlen %s mellett!\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2902
 #, 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:2918
+#: g10/gpg.c:2916
 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:2924
+#: g10/gpg.c:2922
 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:2930
+#: g10/gpg.c:2928
 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:2943
+#: g10/gpg.c:2941
 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:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
+#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1303
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
+#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1311
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3025
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3040
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3042
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3044
 #, 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:3048
+#: g10/gpg.c:3046
 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:3050
+#: g10/gpg.c:3048
 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:3053
+#: g10/gpg.c:3051
 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:3057
+#: g10/gpg.c:3055
 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:3064
+#: g10/gpg.c:3062
 msgid "invalid default preferences\n"
 msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3071
 msgid "invalid personal cipher preferences\n"
 msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3075
 msgid "invalid personal digest preferences\n"
 msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3079
 msgid "invalid personal compress preferences\n"
 msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
 
-#: g10/gpg.c:3114
+#: g10/gpg.c:3112
 #, 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:3161
+#: g10/gpg.c:3159
 #, 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:3166
+#: g10/gpg.c:3164
 #, 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:3171
+#: g10/gpg.c:3169
 #, 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:3263
+#: g10/gpg.c:3261
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3272
 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:3295
+#: g10/gpg.c:3293
 msgid "--store [filename]"
 msgstr "--store [f�jln�v]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3300
 msgid "--symmetric [filename]"
 msgstr "--symmetric [f�jln�v]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3302
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3312
 msgid "--encrypt [filename]"
 msgstr "--encrypt [f�jln�v]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3325
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3327
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3332
+#: g10/gpg.c:3330
 #, 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:3350
+#: g10/gpg.c:3348
 msgid "--sign [filename]"
 msgstr "--sign [f�jln�v]"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3361
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3376
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3378
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3381
 #, 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:3403
+#: g10/gpg.c:3401
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [f�jln�v]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3410
 msgid "--clearsign [filename]"
 msgstr "--clearsign [f�jln�v]"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3435
 msgid "--decrypt [filename]"
 msgstr "--decrypt [f�jln�v]"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3443
 msgid "--sign-key user-id"
 msgstr "--sign-key felh-azonos�t�"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3447
 msgid "--lsign-key user-id"
 msgstr "--lsign-key felh-azonos�t�"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3468
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key felh-azonos�t� [parancsok]"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3553
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3557
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexport�l�s sikertelen: %s\n"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3568
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
 
-#: g10/gpg.c:3580
+#: g10/gpg.c:3578
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3631
+#: g10/gpg.c:3629
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
 
-#: g10/gpg.c:3639
+#: g10/gpg.c:3637
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/gpg.c:3729
+#: g10/gpg.c:3727
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3844
 msgid "[filename]"
 msgstr "[f�jln�v]"
 
-#: g10/gpg.c:3850
+#: g10/gpg.c:3848
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti g�pelni az �zenetet...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4160
 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:4162
 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:4195
 #, 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"
@@ -2283,7 +2294,7 @@ msgstr "a megadott kulcskarik�r�l vegye a kulcsokat"
 msgid "make timestamp conflicts only a warning"
 msgstr "id�b�lyeg-konfliktus eset�n csak figyelmeztessen"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:368
+#: g10/gpgv.c:75 sm/gpgsm.c:372
 msgid "|FD|write status info to this FD"
 msgstr "|�L|�llapotinform�ci�k �r�sa �L �llom�nyle�r�ra"
 
@@ -6740,64 +6751,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 
-#: scd/scdaemon.c:105
+#: scd/scdaemon.c:108
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:357
+#: scd/scdaemon.c:114 sm/gpgsm.c:361
 #, fuzzy
 msgid "read options from file"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:124
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|N�V|N�V haszn�lata alap�rtelmezett c�mzettk�nt"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|N�V|N�V haszn�lata alap�rtelmezett c�mzettk�nt"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:129
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "ne haszn�lja a termin�lt egy�ltal�n"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:134
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:135
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: scd/scdaemon.c:206
+#: scd/scdaemon.c:209
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: scd/scdaemon.c:208
+#: scd/scdaemon.c:211
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:671
+#: scd/scdaemon.c:658
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1019
+#: scd/scdaemon.c:1006
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1024
+#: scd/scdaemon.c:1011
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6826,143 +6837,257 @@ msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:174
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr ""
+
+#: sm/certchain.c:195
+msgid "chain"
+msgstr ""
+
+#: sm/certchain.c:196
+#, fuzzy
+msgid "shell"
+msgstr "help"
+
+#: sm/certchain.c:241
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
 
-#: sm/certchain.c:212
+#: sm/certchain.c:279
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:250
+#: sm/certchain.c:317
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:260
+#: sm/certchain.c:327
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: sm/certchain.c:267 sm/certchain.c:296
+#: sm/certchain.c:334 sm/certchain.c:363
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:271 sm/certchain.c:300
+#: sm/certchain.c:338 sm/certchain.c:367
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: sm/certchain.c:411
+#: sm/certchain.c:478
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:431
+#: sm/certchain.c:498
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: sm/certchain.c:675
+#: sm/certchain.c:742
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "MEGJEGYZ�S: A kulcsot visszavont�k."
 
-#: sm/certchain.c:684
+#: sm/certchain.c:752
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "rossz igazol�s"
 
-#: sm/certchain.c:688
+#: sm/certchain.c:757
+msgid "the status of the certificate is unknown"
+msgstr ""
+
+#: sm/certchain.c:762
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Kulcs tal�lhat�: "
 
-#: sm/certchain.c:690
+#: sm/certchain.c:764
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:695
+#: sm/certchain.c:770
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
 
-#: sm/certchain.c:791
-#, fuzzy
-msgid "no issuer found in certificate"
-msgstr "visszavon�si igazol�s k�sz�t�se"
-
-#: sm/certchain.c:820
+#: sm/certchain.c:799 sm/certchain.c:867
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:836
+#: sm/certchain.c:814 sm/certchain.c:899
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:849
+#: sm/certchain.c:815 sm/certchain.c:900
+#, fuzzy
+msgid "root certificate not yet valid"
+msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
+
+#: sm/certchain.c:816 sm/certchain.c:901
+msgid "intermediate certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:829
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Ez a kulcs lej�rt!"
 
-#: sm/certchain.c:892
-msgid "self-signed certificate has a BAD signature"
+#: sm/certchain.c:830
+#, fuzzy
+msgid "root certificate has expired"
+msgstr "Ez a kulcs lej�rt!"
+
+#: sm/certchain.c:831
+#, fuzzy
+msgid "intermediate certificate has expired"
+msgstr "Ez a kulcs lej�rt!"
+
+#: sm/certchain.c:873
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:960
-msgid "root certificate is not marked trusted"
+#: sm/certchain.c:882
+#, fuzzy
+msgid "certificate with invalid validity"
+msgstr "Ez a kulcs lej�rt!"
+
+#: sm/certchain.c:919
+msgid "signature not created during lifetime of certificate"
+msgstr ""
+
+#: sm/certchain.c:921
+msgid "certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:922
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:926
+#, fuzzy
+msgid "  (  signature created at "
+msgstr "              �j al��r�sok: %lu\n"
+
+#: sm/certchain.c:927
+#, fuzzy
+msgid "  (certificate created at "
+msgstr "Visszavon� igazol�s l�trehozva.\n"
+
+#: sm/certchain.c:930
+#, fuzzy
+msgid "  (certificate valid from "
+msgstr "rossz igazol�s"
+
+#: sm/certchain.c:931
+msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:975
+#: sm/certchain.c:961
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: sm/certchain.c:983
+#: sm/certchain.c:970
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:998
+#: sm/certchain.c:983
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1004
+#: sm/certchain.c:989
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1046
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr ""
+
+#: sm/certchain.c:1110
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "visszavon�si igazol�s k�sz�t�se"
+
+#: sm/certchain.c:1184
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:1253
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:1266
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
 
-#: sm/certchain.c:1041 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1053
+#: sm/certchain.c:1307
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1086
+#: sm/certchain.c:1340
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "al��r�s ellen�rz�se"
 
-#: sm/certchain.c:1116
+#: sm/certchain.c:1371
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1167
+#: sm/certchain.c:1422
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
+#: sm/certchain.c:1462 sm/certchain.c:1730
+#, fuzzy
+msgid "certificate is good\n"
+msgstr "%c%lu preferencia k�tszer szerepel!\n"
+
+#: sm/certchain.c:1463
+#, fuzzy
+msgid "intermediate certificate is good\n"
+msgstr "Visszavon� igazol�s l�trehozva.\n"
+
+#: sm/certchain.c:1464
+#, fuzzy
+msgid "root certificate is good\n"
+msgstr "rossz igazol�s"
+
+#: sm/certchain.c:1620
+msgid "switching to chain model"
+msgstr ""
+
+#: sm/certchain.c:1629
+#, c-format
+msgid "validation model used: %s"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "chain model"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "shell model"
+msgstr ""
+
 #: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
@@ -7010,7 +7135,7 @@ msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
 "\"%s\"\n"
-"S/N %s, ID %08lX, created %s"
+"S/N %s, ID 0x%08lX, created %s"
 msgstr ""
 "Most meg kell adnia a jelsz�t, mellyel a k�vetkez� felhaszn�l�\n"
 "titkos kulcsa haszn�latba vehet�:\n"
@@ -7021,7 +7146,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:131 sm/keylist.c:255
+#: sm/certlist.c:131 sm/keylist.c:258
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
@@ -7143,181 +7268,181 @@ msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[f�jl]|al��r�s k�sz�t�se"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
 
-#: sm/gpgsm.c:251
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list external keys"
 msgstr "titkos kulcsok list�z�sa"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list certificate chain"
 msgstr "rossz igazol�s"
 
-#: sm/gpgsm.c:256
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "import certificates"
 msgstr "rossz igazol�s"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:262
 #, fuzzy
 msgid "export certificates"
 msgstr "rossz igazol�s"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:268
 #, fuzzy
 msgid "change a passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:287
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:296
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:302
+#: sm/gpgsm.c:304
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:305
+#: sm/gpgsm.c:309
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:312
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:315
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:319
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:323
 msgid "|NAME|use NAME as default recipient"
 msgstr "|N�V|N�V haszn�lata alap�rtelmezett c�mzettk�nt"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:325
 msgid "use the default key as default recipient"
 msgstr "alap�rt. kulcs haszn. alap�rt. c�mzettk�nt"
 
-#: sm/gpgsm.c:338
+#: sm/gpgsm.c:342
 msgid "don't use the terminal at all"
 msgstr "ne haszn�lja a termin�lt egy�ltal�n"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:346
 msgid "force v3 signatures"
 msgstr "3-as verzi�j� al��r�sok er�ltet�se"
 
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:347
 msgid "always use a MDC for encryption"
 msgstr "mindig haszn�ljon MDC-t titkos�t�skor"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:352
 msgid "batch mode: never ask"
 msgstr "k�tegelt m�d: soha nem k�rdez"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:353
 msgid "assume yes on most questions"
 msgstr "igen v�lasz felt�telez�se a legt�bb k�rd�sre"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:354
 msgid "assume no on most questions"
 msgstr "nem v�lasz felt�telez�se a legt�bb k�rd�sre"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:356
 msgid "add this keyring to the list of keyrings"
 msgstr "kulcskarika hozz�ad�sa a kulcskarikalist�hoz"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:357
 msgid "add this secret keyring to the list"
 msgstr "titkoskulcs-karika hozz�ad�sa a list�hoz"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
 msgid "|NAME|use NAME as default secret key"
 msgstr "|N�V|N�V haszn�lata alap�rtelmezett titkos kulcsk�nt"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:359
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|G�PN�V|kulcsszerver be�ll�t�sa kulcsok keres�s�hez"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:360
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|N�V|termin�l karakterk�dol�s�nak megad�sa"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:364
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:375
+#: sm/gpgsm.c:379
 msgid "|FILE|load extension module FILE"
 msgstr "|f�jl|b�v�t� modul bet�lt�se"
 
-#: sm/gpgsm.c:381
+#: sm/gpgsm.c:385
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|N�V|N�V rejtjelez� algoritmus haszn�lata"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:387
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|N�V|N�V kivonatol� algoritmus haszn�lata"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:389
 msgid "|N|use compress algorithm N"
 msgstr "|N|N. sorsz�m� t�m�r�t� algoritmus haszn�lata"
 
-#: sm/gpgsm.c:522
+#: sm/gpgsm.c:528
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: sm/gpgsm.c:525
+#: sm/gpgsm.c:531
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7328,31 +7453,36 @@ 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"
 
-#: sm/gpgsm.c:604
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: sm/gpgsm.c:685
+#: sm/gpgsm.c:691
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
 
-#: sm/gpgsm.c:1237
+#: sm/gpgsm.c:713
+#, fuzzy, c-format
+msgid "unknown validation model `%s'\n"
+msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
+
+#: sm/gpgsm.c:1264
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1316
+#: sm/gpgsm.c:1344
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
-#: sm/gpgsm.c:1334
+#: sm/gpgsm.c:1362
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "Nem tudom bez�rni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: sm/gpgsm.c:1529
+#: sm/gpgsm.c:1543
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7375,7 +7505,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:375
+#: sm/import.c:541 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
@@ -7459,7 +7589,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234
+#: sm/qualified.c:234 sm/verify.c:536
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7478,30 +7608,37 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
 
-#: sm/verify.c:386
+#: sm/verify.c:388
 #, fuzzy
 msgid "Signature made "
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: sm/verify.c:390
+#: sm/verify.c:392
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:391
-#, c-format
-msgid " using certificate ID %08lX\n"
-msgstr ""
+#: sm/verify.c:393
+#, fuzzy, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: sm/verify.c:507
+#: sm/verify.c:514
 #, fuzzy
 msgid "Good signature from"
 msgstr "J� al��r�s a k�vetkez�t�l: \""
 
-#: sm/verify.c:508
+#: sm/verify.c:515
 #, fuzzy
 msgid "                aka"
 msgstr "               azaz \""
 
+#: sm/verify.c:533
+#, fuzzy
+msgid "This is a qualified signature\n"
+msgstr ""
+"\n"
+"Ez egy �nal��r�s lesz.\n"
+
 #: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
@@ -7538,132 +7675,137 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:315
+#: tools/gpg-connect-agent.c:314
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:323
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:382
+#: tools/gpg-connect-agent.c:381
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "A sor t�l hossz�!\n"
 
-#: tools/gpg-connect-agent.c:386
+#: tools/gpg-connect-agent.c:385
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:458
+#: tools/gpg-connect-agent.c:457
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:466
+#: tools/gpg-connect-agent.c:465
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "Al��r�s sikertelen: %s\n"
 
-#: tools/gpg-connect-agent.c:474
+#: tools/gpg-connect-agent.c:473
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: tools/gpg-connect-agent.c:784
+#: tools/gpg-connect-agent.c:789
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
 
-#: tools/gpg-connect-agent.c:793
+#: tools/gpg-connect-agent.c:798
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
+#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
-#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
+#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
-#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:501
+#: tools/gpgconf-comp.c:492
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:505
+#: tools/gpgconf-comp.c:496
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:509
+#: tools/gpgconf-comp.c:500
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:510
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:638
+#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#, fuzzy
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|N�V|titkos�t�s N�V r�sz�re"
+
+#: tools/gpgconf-comp.c:635
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:640
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|N�V|N�V rejtjelez� algoritmus haszn. jelszavakhoz"
 
-#: tools/gpgconf-comp.c:705
+#: tools/gpgconf-comp.c:708
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:749
+#: tools/gpgconf-comp.c:752
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:785
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:806
+#: tools/gpgconf-comp.c:809
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:814
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:848
+#: tools/gpgconf-comp.c:851
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2681
+#: tools/gpgconf-comp.c:2684
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8283,9 +8425,6 @@ msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 #~ msgid "q"
 #~ msgstr "q"
 
-#~ msgid "help"
-#~ msgstr "help"
-
 #~ msgid "list"
 #~ msgstr "list"
 
diff --git a/po/id.po b/po/id.po
index d0177eff9..a7c3e7980 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-07-05 18:01+0200\n"
+"POT-Creation-Date: 2007-08-10 15:49+0200\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -21,54 +21,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: agent/call-pinentry.c:426
+#: agent/call-pinentry.c:436
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:429
+#: agent/call-pinentry.c:439
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/call-pinentry.c:476
+#: agent/call-pinentry.c:486
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
+#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
 #, fuzzy
 msgid "PIN too long"
 msgstr "baris terlalu panjang\n"
 
-#: agent/call-pinentry.c:497
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "passphrase terlalu panjang\n"
 
-#: agent/call-pinentry.c:505
+#: agent/call-pinentry.c:515
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:520
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:522
+#: agent/call-pinentry.c:532
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI yang buruk"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:533
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "passphrase yang buruk"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:569
 #, fuzzy
 msgid "Passphrase"
 msgstr "passphrase yang buruk"
@@ -85,14 +85,14 @@ msgstr "algoritma proteksi %d%s tidak didukung\n"
 msgid "can't create `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
 #: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
-#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1796
+#: sm/gpgsm.c:1833 sm/gpgsm.c:1871 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
@@ -179,35 +179,46 @@ msgstr[1] ""
 msgid "Take this one anyway"
 msgstr "Tetap gunakan kunci ini? "
 
-#: agent/genkey.c:99
+#: agent/genkey.c:99 agent/genkey.c:114
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Masukkan passphrase\n"
 
-#: agent/genkey.c:144
+#: agent/genkey.c:107
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+
+#: agent/genkey.c:113
+msgid "Yes, protection is not needed"
+msgstr ""
+
+#: agent/genkey.c:158
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
+#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "ubah passphrase"
 
-#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
 #: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:263
+#: agent/genkey.c:280
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "ubah passphrase"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -217,247 +228,247 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:103
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
-#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
 #: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detil"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
-#: sm/gpgsm.c:337
+#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:109
+#: agent/gpg-agent.c:118 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:119
+#: agent/gpg-agent.c:125 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:125
+#: agent/gpg-agent.c:126
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "cari kunci di key server"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:129
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "perbarui database trust"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:145
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:206 sm/gpgsm.c:525 tools/gpg-connect-agent.c:124
 #: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Laporkan bug ke <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:262
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
+#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
-#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:340 sm/gpgsm.c:772 sm/gpgsm.c:775 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
+#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:863
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
-#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: scd/scdaemon.c:421 sm/gpgsm.c:867 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
+#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:874
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
-#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:921
+#: agent/gpg-agent.c:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
+#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:908
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
+#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
+#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
+#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
+#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: direktori tercipta\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1377
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1381
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: tidak dapat membuat direktori: %s\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1497
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1519
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
+#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
+#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: dilewati: %s\n"
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1752
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:751
+#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
 
-#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
-#: tools/gpg-connect-agent.c:762
+#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "protokol gpg-agent versi %d tidak didukung\n"
@@ -522,42 +533,42 @@ msgstr "kesalahan penciptaan passphrase: %s\n"
 msgid "cancelled\n"
 msgstr "Batal"
 
-#: agent/trustlist.c:131 agent/trustlist.c:319
+#: agent/trustlist.c:132 agent/trustlist.c:322
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: agent/trustlist.c:146
+#: agent/trustlist.c:147
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: agent/trustlist.c:166 agent/trustlist.c:174
+#: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:180
+#: agent/trustlist.c:181
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "bagian kunci rahasia tidak tersedia\n"
 
-#: agent/trustlist.c:215
+#: agent/trustlist.c:216
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "kesalahan pembacaan: %s\n"
 
-#: agent/trustlist.c:241 agent/trustlist.c:248
+#: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:280
+#: agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: agent/trustlist.c:381 agent/trustlist.c:420
+#: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -570,7 +581,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:496
+#: agent/trustlist.c:507
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -580,7 +591,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:505
+#: agent/trustlist.c:516
 msgid "Correct"
 msgstr ""
 
@@ -592,58 +603,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:525
+#: agent/trustlist.c:536
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 #, fuzzy
 msgid "Yes"
 msgstr "y|ya"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:393
+#: common/exechelp.c:302 common/exechelp.c:390
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: common/exechelp.c:369 common/exechelp.c:426
+#: common/exechelp.c:366 common/exechelp.c:423
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: common/exechelp.c:405 common/exechelp.c:635
+#: common/exechelp.c:402 common/exechelp.c:632
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: common/exechelp.c:461 common/exechelp.c:504
+#: common/exechelp.c:458 common/exechelp.c:501
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:469
+#: common/exechelp.c:466
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: common/exechelp.c:475 common/exechelp.c:515
+#: common/exechelp.c:472 common/exechelp.c:512
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: common/exechelp.c:510
+#: common/exechelp.c:507
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:521
+#: common/exechelp.c:518
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -662,26 +673,26 @@ msgstr "[User id tidak ditemukan]"
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: common/simple-pwquery.c:376
+#: common/simple-pwquery.c:373
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 
-#: common/simple-pwquery.c:387
+#: common/simple-pwquery.c:384
 msgid "communication problem with gpg-agent\n"
 msgstr "masalah komunikasi dengan gpg-agent\n"
 
-#: common/simple-pwquery.c:397
+#: common/simple-pwquery.c:394
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
 
-#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+#: common/simple-pwquery.c:557 common/simple-pwquery.c:653
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "dibatalkan oleh user\n"
 
-#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+#: common/simple-pwquery.c:572 common/simple-pwquery.c:659
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
@@ -863,7 +874,7 @@ msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
 msgid "not human readable"
 msgstr "tidak dapat dibaca manusia"
 
-#: g10/card-util.c:62 g10/card-util.c:305
+#: g10/card-util.c:62 g10/card-util.c:308
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "kunci rahasia tidak tersedia"
@@ -873,166 +884,166 @@ msgstr "kunci rahasia tidak tersedia"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1391 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
 #: g10/keygen.c:1644
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
-#: g10/card-util.c:215 g10/card-util.c:265
+#: g10/card-util.c:218 g10/card-util.c:268
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:412
+#: g10/card-util.c:415
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 #, fuzzy
 msgid "unspecified"
 msgstr "Tidak ada alasan diberikan"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 #, fuzzy
 msgid "not forced"
 msgstr "tidak diproses"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:521
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:523
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:525
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:539
+#: g10/card-util.c:542
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:544
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:562
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:580
+#: g10/card-util.c:583
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "tidak ada kunci publik yang sesuai: %s\n"
 
-#: g10/card-util.c:588
+#: g10/card-util.c:591
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
+#: g10/card-util.c:689 g10/card-util.c:758 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/card-util.c:694
+#: g10/card-util.c:697
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:704
+#: g10/card-util.c:707
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:763
+#: g10/card-util.c:766
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:773
+#: g10/card-util.c:776
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:793
+#: g10/card-util.c:796
 #, fuzzy
 msgid "Language preferences: "
 msgstr "perbarui preferensi"
 
-#: g10/card-util.c:801
+#: g10/card-util.c:804
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:813
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:831
+#: g10/card-util.c:834
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:845
+#: g10/card-util.c:848
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:866
+#: g10/card-util.c:869
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:889
+#: g10/card-util.c:892
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:937
+#: g10/card-util.c:940
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:941
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/card-util.c:947
+#: g10/card-util.c:950
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/card-util.c:1031
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1051 g10/card-util.c:1060
+#: g10/card-util.c:1054 g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1075
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1084
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1040,136 +1051,136 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1115
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/card-util.c:1117 g10/card-util.c:1194
+#: g10/card-util.c:1120 g10/card-util.c:1197
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/card-util.c:1118 g10/card-util.c:1196
+#: g10/card-util.c:1121 g10/card-util.c:1199
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1198
+#: g10/card-util.c:1122 g10/card-util.c:1201
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1135 g10/card-util.c:1214 g10/keyedit.c:945
+#: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
 #: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
-#: g10/card-util.c:1191
+#: g10/card-util.c:1194
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: g10/card-util.c:1226
+#: g10/card-util.c:1229
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritma proteksi tidak dikenal\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1234
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1239
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/card-util.c:1304 g10/keyedit.c:1362
+#: g10/card-util.c:1307 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1309
 #, fuzzy
 msgid "show admin commands"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1307 g10/keyedit.c:1365
+#: g10/card-util.c:1310 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1312
 #, fuzzy
 msgid "list all available data"
 msgstr "Kunci tersedia di:"
 
-#: g10/card-util.c:1312
+#: g10/card-util.c:1315
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1313
+#: g10/card-util.c:1316
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1317
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1315
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "change the login name"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/card-util.c:1316
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "change the language preferences"
 msgstr "ubah ownertrust"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1320
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1322
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1323
 #, fuzzy
 msgid "generate new keys"
 msgstr "buat sepasang kunci baru"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1324
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1325
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442 g10/keyedit.c:1634
+#: g10/card-util.c:1445 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Perintah> "
 
-#: g10/card-util.c:1480
+#: g10/card-util.c:1483
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1511
+#: g10/card-util.c:1514
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1513
+#: g10/card-util.c:1516
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/card-util.c:1587 g10/keyedit.c:2255
+#: g10/card-util.c:1590 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
@@ -1177,7 +1188,7 @@ msgstr "Perintah tidak valid (coba \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
@@ -1483,7 +1494,7 @@ msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1499,27 +1510,27 @@ msgstr "|[file]|buat signature"
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/gpg.c:372 sm/gpgsm.c:244
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/gpg.c:375 sm/gpgsm.c:246
+#: g10/gpg.c:375 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/gpg.c:377 sm/gpgsm.c:247
+#: g10/gpg.c:377 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:248
+#: g10/gpg.c:379 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/gpg.c:381 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "tampilkan kunci"
 
@@ -1532,11 +1543,11 @@ msgstr "tampilkan kunci dan signature"
 msgid "list and check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/gpg.c:385 sm/gpgsm.c:254
+#: g10/gpg.c:385 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/gpg.c:386 sm/gpgsm.c:252
+#: g10/gpg.c:386 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
@@ -1572,11 +1583,11 @@ msgstr "buat sertifikat revokasi"
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/gpg.c:397 sm/gpgsm.c:257
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
@@ -1612,11 +1623,11 @@ msgstr "perbarui database trust"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/gpg.c:430 sm/gpgsm.c:262
+#: g10/gpg.c:430 sm/gpgsm.c:264
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
 #: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1627,31 +1638,31 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/gpg.c:434 sm/gpgsm.c:279
+#: g10/gpg.c:434 sm/gpgsm.c:281
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/gpg.c:436 sm/gpgsm.c:291
+#: g10/gpg.c:436 sm/gpgsm.c:293
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/gpg.c:447 sm/gpgsm.c:327
+#: g10/gpg.c:447 sm/gpgsm.c:331
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/gpg.c:448 sm/gpgsm.c:330
+#: g10/gpg.c:448 sm/gpgsm.c:334
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:332
+#: g10/gpg.c:453 sm/gpgsm.c:336
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
@@ -1667,7 +1678,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:393
+#: g10/gpg.c:553 sm/gpgsm.c:397
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1675,7 +1686,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:396
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1713,7 +1724,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:532
+#: g10/gpg.c:781 sm/gpgsm.c:538
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1741,7 +1752,7 @@ msgstr "Kompresi: "
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:669
+#: g10/gpg.c:1045 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
@@ -1817,470 +1828,470 @@ msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1554
+#: 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:1556
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1560
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 
-#: g10/gpg.c:1564
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1827
+#: g10/gpg.c:1825
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1981
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
 
-#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
+#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/gpg.c:2401 g10/gpg.c:2413
+#: g10/gpg.c:2399 g10/gpg.c:2411
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2493
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4084
+#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2528
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2531
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2538
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2541
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2548
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2551
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2558
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2561
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2569
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2571
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2573
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2575
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2579
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2581
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2585
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2587
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2589
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2591
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2598
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2608
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2782
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2787
+#: g10/gpg.c:2785
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2873 sm/gpgsm.c:1220
+#: g10/gpg.c:2871 sm/gpgsm.c:1247
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2875
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2884
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2887
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2902
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/gpg.c:2918
+#: g10/gpg.c:2916
 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:2924
+#: g10/gpg.c:2922
 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:2930
+#: g10/gpg.c:2928
 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:2943
+#: g10/gpg.c:2941
 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:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
+#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1303
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
+#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1311
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3025
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3040
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3042
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3044
 #, 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:3048
+#: g10/gpg.c:3046
 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:3050
+#: g10/gpg.c:3048
 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:3053
+#: g10/gpg.c:3051
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/gpg.c:3057
+#: g10/gpg.c:3055
 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:3064
+#: g10/gpg.c:3062
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3071
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3075
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3079
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/gpg.c:3114
+#: g10/gpg.c:3112
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3159
 #, 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:3166
+#: g10/gpg.c:3164
 #, 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:3171
+#: g10/gpg.c:3169
 #, 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:3263
+#: g10/gpg.c:3261
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3272
 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:3295
+#: g10/gpg.c:3293
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3300
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3302
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3312
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3325
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3327
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3332
+#: g10/gpg.c:3330
 #, 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:3350
+#: g10/gpg.c:3348
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3361
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3376
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3378
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3381
 #, 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:3403
+#: g10/gpg.c:3401
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3410
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3435
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3443
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3447
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3468
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3553
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3557
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3568
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/gpg.c:3580
+#: g10/gpg.c:3578
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/gpg.c:3631
+#: g10/gpg.c:3629
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/gpg.c:3639
+#: g10/gpg.c:3637
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/gpg.c:3729
+#: g10/gpg.c:3727
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3844
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/gpg.c:3850
+#: g10/gpg.c:3848
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4160
 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:4162
 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:4195
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@ -2293,7 +2304,7 @@ msgstr "mengambil kunci ini dari keyring"
 msgid "make timestamp conflicts only a warning"
 msgstr "buat timestamp konflik hanya sebagai peringatan"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:368
+#: g10/gpgv.c:75 sm/gpgsm.c:372
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
@@ -6743,64 +6754,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: scd/scdaemon.c:105
+#: scd/scdaemon.c:108
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:357
+#: scd/scdaemon.c:114 sm/gpgsm.c:361
 #, fuzzy
 msgid "read options from file"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:124
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:129
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "jangan menggunakan terminal"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:134
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:135
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "perintah saling konflik\n"
 
-#: scd/scdaemon.c:206
+#: scd/scdaemon.c:209
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: scd/scdaemon.c:208
+#: scd/scdaemon.c:211
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:671
+#: scd/scdaemon.c:658
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1019
+#: scd/scdaemon.c:1006
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1024
+#: scd/scdaemon.c:1011
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6829,143 +6840,257 @@ msgstr "protokol gpg-agent versi %d tidak didukung\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:174
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr ""
+
+#: sm/certchain.c:195
+msgid "chain"
+msgstr ""
+
+#: sm/certchain.c:196
+#, fuzzy
+msgid "shell"
+msgstr "bantuan"
+
+#: sm/certchain.c:241
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "protokol gpg-agent versi %d tidak didukung\n"
 
-#: sm/certchain.c:212
+#: sm/certchain.c:279
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:250
+#: sm/certchain.c:317
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:260
+#: sm/certchain.c:327
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: sm/certchain.c:267 sm/certchain.c:296
+#: sm/certchain.c:334 sm/certchain.c:363
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:271 sm/certchain.c:300
+#: sm/certchain.c:338 sm/certchain.c:367
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: sm/certchain.c:411
+#: sm/certchain.c:478
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:431
+#: sm/certchain.c:498
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: sm/certchain.c:675
+#: sm/certchain.c:742
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "CATATAN: kunci telah dibatalkan"
 
-#: sm/certchain.c:684
+#: sm/certchain.c:752
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "sertifikat yang buruk"
 
-#: sm/certchain.c:688
+#: sm/certchain.c:757
+msgid "the status of the certificate is unknown"
+msgstr ""
+
+#: sm/certchain.c:762
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Kunci tersedia di:"
 
-#: sm/certchain.c:690
+#: sm/certchain.c:764
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:695
+#: sm/certchain.c:770
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: sm/certchain.c:791
-#, fuzzy
-msgid "no issuer found in certificate"
-msgstr "buat sertifikat revokasi"
-
-#: sm/certchain.c:820
+#: sm/certchain.c:799 sm/certchain.c:867
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:836
+#: sm/certchain.c:814 sm/certchain.c:899
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:849
+#: sm/certchain.c:815 sm/certchain.c:900
+#, fuzzy
+msgid "root certificate not yet valid"
+msgstr "menulis kunci rahasia ke `%s'\n"
+
+#: sm/certchain.c:816 sm/certchain.c:901
+msgid "intermediate certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:829
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Kunci ini telah berakhir!"
 
-#: sm/certchain.c:892
-msgid "self-signed certificate has a BAD signature"
+#: sm/certchain.c:830
+#, fuzzy
+msgid "root certificate has expired"
+msgstr "Kunci ini telah berakhir!"
+
+#: sm/certchain.c:831
+#, fuzzy
+msgid "intermediate certificate has expired"
+msgstr "Kunci ini telah berakhir!"
+
+#: sm/certchain.c:873
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:960
-msgid "root certificate is not marked trusted"
+#: sm/certchain.c:882
+#, fuzzy
+msgid "certificate with invalid validity"
+msgstr "Kunci ini telah berakhir!"
+
+#: sm/certchain.c:919
+msgid "signature not created during lifetime of certificate"
+msgstr ""
+
+#: sm/certchain.c:921
+msgid "certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:922
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:926
+#, fuzzy
+msgid "  (  signature created at "
+msgstr "       signature baru: %lu\n"
+
+#: sm/certchain.c:927
+#, fuzzy
+msgid "  (certificate created at "
+msgstr "Sertifikat pembatalan tercipta.\n"
+
+#: sm/certchain.c:930
+#, fuzzy
+msgid "  (certificate valid from "
+msgstr "sertifikat yang buruk"
+
+#: sm/certchain.c:931
+msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:975
+#: sm/certchain.c:961
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "tampilkan fingerprint"
 
-#: sm/certchain.c:983
+#: sm/certchain.c:970
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:998
+#: sm/certchain.c:983
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1004
+#: sm/certchain.c:989
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1046
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr ""
+
+#: sm/certchain.c:1110
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "buat sertifikat revokasi"
+
+#: sm/certchain.c:1184
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:1253
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:1266
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: sm/certchain.c:1041 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1053
+#: sm/certchain.c:1307
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1086
+#: sm/certchain.c:1340
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifikasi signature"
 
-#: sm/certchain.c:1116
+#: sm/certchain.c:1371
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1167
+#: sm/certchain.c:1422
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
+#: sm/certchain.c:1462 sm/certchain.c:1730
+#, fuzzy
+msgid "certificate is good\n"
+msgstr "preferensi %c%lu ganda \n"
+
+#: sm/certchain.c:1463
+#, fuzzy
+msgid "intermediate certificate is good\n"
+msgstr "Sertifikat pembatalan tercipta.\n"
+
+#: sm/certchain.c:1464
+#, fuzzy
+msgid "root certificate is good\n"
+msgstr "sertifikat yang buruk"
+
+#: sm/certchain.c:1620
+msgid "switching to chain model"
+msgstr ""
+
+#: sm/certchain.c:1629
+#, c-format
+msgid "validation model used: %s"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "chain model"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "shell model"
+msgstr ""
+
 #: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
@@ -7013,7 +7138,7 @@ msgstr "kesalahan: fingerprint tidak valid\n"
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
 "\"%s\"\n"
-"S/N %s, ID %08lX, created %s"
+"S/N %s, ID 0x%08lX, created %s"
 msgstr ""
 "Anda perlu passphrase untuk membuka kunci rahasia untuk user:\n"
 "\"%.*s\"\n"
@@ -7023,7 +7148,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:131 sm/keylist.c:255
+#: sm/certlist.c:131 sm/keylist.c:258
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
@@ -7145,181 +7270,181 @@ msgstr "kesalahan penciptaan passphrase: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "menulis ke `%s'\n"
 
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: sm/gpgsm.c:251
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list external keys"
 msgstr "tampilkan kunci rahasia"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list certificate chain"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:256
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "import certificates"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:262
 #, fuzzy
 msgid "export certificates"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:268
 #, fuzzy
 msgid "change a passphrase"
 msgstr "ubah passphrase"
 
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "ciptakan output ascii"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:287
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:296
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:302
+#: sm/gpgsm.c:304
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:305
+#: sm/gpgsm.c:309
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:312
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:315
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:319
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:323
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:325
 msgid "use the default key as default recipient"
 msgstr "gunakan kunci baku sebagai penerima baku"
 
-#: sm/gpgsm.c:338
+#: sm/gpgsm.c:342
 msgid "don't use the terminal at all"
 msgstr "jangan menggunakan terminal"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:346
 msgid "force v3 signatures"
 msgstr "paksa signature v3"
 
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:347
 msgid "always use a MDC for encryption"
 msgstr "selalu gunakan MDC untuk enkripsi"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:352
 msgid "batch mode: never ask"
 msgstr "mode batch: tanpa tanya"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:353
 msgid "assume yes on most questions"
 msgstr "asumsikan ya untuk seluruh pertanyaan"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:354
 msgid "assume no on most questions"
 msgstr "asumsikan tidak untuk seluruh pertanyaan"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:356
 msgid "add this keyring to the list of keyrings"
 msgstr "tambah keyring ini ke daftar keyring"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:357
 msgid "add this secret keyring to the list"
 msgstr "tambah keyring rahasia ini ke daftar"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:359
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:360
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMA|set charset terminal ke NAMA"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:364
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:375
+#: sm/gpgsm.c:379
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: sm/gpgsm.c:381
+#: sm/gpgsm.c:385
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMA|gunakan algoritma cipher NAMA"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:387
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:389
 msgid "|N|use compress algorithm N"
 msgstr "|N|gunakan algoritma kompresi N"
 
-#: sm/gpgsm.c:522
+#: sm/gpgsm.c:528
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: sm/gpgsm.c:525
+#: sm/gpgsm.c:531
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7330,31 +7455,36 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: sm/gpgsm.c:604
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: sm/gpgsm.c:685
+#: sm/gpgsm.c:691
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 
-#: sm/gpgsm.c:1237
+#: sm/gpgsm.c:713
+#, fuzzy, c-format
+msgid "unknown validation model `%s'\n"
+msgstr "penerima baku tidak dikenal `%s'\n"
+
+#: sm/gpgsm.c:1264
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1316
+#: sm/gpgsm.c:1344
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: sm/gpgsm.c:1334
+#: sm/gpgsm.c:1362
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: sm/gpgsm.c:1529
+#: sm/gpgsm.c:1543
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7377,7 +7507,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:375
+#: sm/import.c:541 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -7461,7 +7591,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234
+#: sm/qualified.c:234 sm/verify.c:536
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7480,30 +7610,37 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: sm/verify.c:386
+#: sm/verify.c:388
 #, fuzzy
 msgid "Signature made "
 msgstr "Signature kadaluwarsa %s\n"
 
-#: sm/verify.c:390
+#: sm/verify.c:392
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:391
-#, c-format
-msgid " using certificate ID %08lX\n"
-msgstr ""
+#: sm/verify.c:393
+#, fuzzy, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/verify.c:507
+#: sm/verify.c:514
 #, fuzzy
 msgid "Good signature from"
 msgstr "Signature baik dari \""
 
-#: sm/verify.c:508
+#: sm/verify.c:515
 #, fuzzy
 msgid "                aka"
 msgstr "              alias \""
 
+#: sm/verify.c:533
+#, fuzzy
+msgid "This is a qualified signature\n"
+msgstr ""
+"\n"
+"Ini akan jadi self-signature.\n"
+
 #: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
@@ -7540,132 +7677,137 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:315
+#: tools/gpg-connect-agent.c:314
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:323
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:382
+#: tools/gpg-connect-agent.c:381
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "baris terlalu panjang\n"
 
-#: tools/gpg-connect-agent.c:386
+#: tools/gpg-connect-agent.c:385
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:458
+#: tools/gpg-connect-agent.c:457
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: tools/gpg-connect-agent.c:466
+#: tools/gpg-connect-agent.c:465
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: tools/gpg-connect-agent.c:474
+#: tools/gpg-connect-agent.c:473
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: tools/gpg-connect-agent.c:784
+#: tools/gpg-connect-agent.c:789
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:793
+#: tools/gpg-connect-agent.c:798
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
+#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
-#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
+#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
-#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:501
+#: tools/gpgconf-comp.c:492
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:505
+#: tools/gpgconf-comp.c:496
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:509
+#: tools/gpgconf-comp.c:500
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:510
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:638
+#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#, fuzzy
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAMA|enkripsi untuk NAMA"
+
+#: tools/gpgconf-comp.c:635
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:640
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
 
-#: tools/gpgconf-comp.c:705
+#: tools/gpgconf-comp.c:708
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:749
+#: tools/gpgconf-comp.c:752
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:785
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:806
+#: tools/gpgconf-comp.c:809
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:814
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:848
+#: tools/gpgconf-comp.c:851
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2681
+#: tools/gpgconf-comp.c:2684
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8284,9 +8426,6 @@ msgstr "algoritma proteksi %d%s tidak didukung\n"
 #~ msgid "q"
 #~ msgstr "q"
 
-#~ msgid "help"
-#~ msgstr "bantuan"
-
 #~ msgid "list"
 #~ msgstr "tampilkan"
 
diff --git a/po/it.po b/po/it.po
index d86f6f28b..efcabb729 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-07-05 18:01+0200\n"
+"POT-Creation-Date: 2007-08-10 15:49+0200\n"
 "PO-Revision-Date: 2004-06-16 17:01+0200\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -19,54 +19,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: agent/call-pinentry.c:426
+#: agent/call-pinentry.c:436
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:429
+#: agent/call-pinentry.c:439
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: agent/call-pinentry.c:476
+#: agent/call-pinentry.c:486
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
+#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
 #, fuzzy
 msgid "PIN too long"
 msgstr "riga troppo lunga\n"
 
-#: agent/call-pinentry.c:497
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "passphrase troppo lunga\n"
 
-#: agent/call-pinentry.c:505
+#: agent/call-pinentry.c:515
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Carattere non valido nel nome\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:520
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:522
+#: agent/call-pinentry.c:532
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI danneggiato"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:533
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "passphrase errata"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:569
 #, fuzzy
 msgid "Passphrase"
 msgstr "passphrase errata"
@@ -83,14 +83,14 @@ msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 msgid "can't create `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
 #: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
-#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1796
+#: sm/gpgsm.c:1833 sm/gpgsm.c:1871 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
@@ -177,35 +177,46 @@ msgstr[1] ""
 msgid "Take this one anyway"
 msgstr "Uso lo stesso questa chiave? "
 
-#: agent/genkey.c:99
+#: agent/genkey.c:99 agent/genkey.c:114
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Inserisci la passphrase\n"
 
-#: agent/genkey.c:144
+#: agent/genkey.c:107
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+
+#: agent/genkey.c:113
+msgid "Yes, protection is not needed"
+msgstr ""
+
+#: agent/genkey.c:158
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
+#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "cambia la passphrase"
 
-#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
 #: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:263
+#: agent/genkey.c:280
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "cambia la passphrase"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -215,247 +226,247 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:103
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
-#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
 #: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "prolisso"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
-#: sm/gpgsm.c:337
+#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:109
+#: agent/gpg-agent.c:118 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:119
+#: agent/gpg-agent.c:125 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:125
+#: agent/gpg-agent.c:126
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "cerca delle chiavi su un key server"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:129
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aggiorna il database della fiducia"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:145
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:206 sm/gpgsm.c:525 tools/gpg-connect-agent.c:124
 #: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Per favore segnala i bug a <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:262
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
+#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
-#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:340 sm/gpgsm.c:772 sm/gpgsm.c:775 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
+#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:863
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
-#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: scd/scdaemon.c:421 sm/gpgsm.c:867 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
+#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:874
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "errore creando `%s': %s\n"
 
-#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
-#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:921
+#: agent/gpg-agent.c:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
+#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:908
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "impossibile creare la directory `%s': %s\n"
 
-#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
+#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
+#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
+#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
+#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directory creata\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1377
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1381
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: impossibile creare la directory: %s\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1497
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1519
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
+#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
+#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: saltata: %s\n"
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1752
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:751
+#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
 
-#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
-#: tools/gpg-connect-agent.c:762
+#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "la versione %d del protocollo di gpg-agent non � gestita\n"
@@ -520,42 +531,42 @@ msgstr "errore nella creazione della passhprase: %s\n"
 msgid "cancelled\n"
 msgstr "Cancella"
 
-#: agent/trustlist.c:131 agent/trustlist.c:319
+#: agent/trustlist.c:132 agent/trustlist.c:322
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: agent/trustlist.c:146
+#: agent/trustlist.c:147
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: agent/trustlist.c:166 agent/trustlist.c:174
+#: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:180
+#: agent/trustlist.c:181
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "parti della chiave segreta non sono disponibili\n"
 
-#: agent/trustlist.c:215
+#: agent/trustlist.c:216
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "errore di lettura: %s\n"
 
-#: agent/trustlist.c:241 agent/trustlist.c:248
+#: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:280
+#: agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: agent/trustlist.c:381 agent/trustlist.c:420
+#: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -568,7 +579,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:496
+#: agent/trustlist.c:507
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -578,7 +589,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:505
+#: agent/trustlist.c:516
 msgid "Correct"
 msgstr ""
 
@@ -590,58 +601,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:525
+#: agent/trustlist.c:536
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 #, fuzzy
 msgid "Yes"
 msgstr "si|s�"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:393
+#: common/exechelp.c:302 common/exechelp.c:390
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: common/exechelp.c:369 common/exechelp.c:426
+#: common/exechelp.c:366 common/exechelp.c:423
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "impossibile aprire il file: %s\n"
 
-#: common/exechelp.c:405 common/exechelp.c:635
+#: common/exechelp.c:402 common/exechelp.c:632
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: common/exechelp.c:461 common/exechelp.c:504
+#: common/exechelp.c:458 common/exechelp.c:501
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:469
+#: common/exechelp.c:466
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: common/exechelp.c:475 common/exechelp.c:515
+#: common/exechelp.c:472 common/exechelp.c:512
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: common/exechelp.c:510
+#: common/exechelp.c:507
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:521
+#: common/exechelp.c:518
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "errore leggendo `%s': %s\n"
@@ -660,26 +671,26 @@ msgstr "[User ID non trovato]"
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: common/simple-pwquery.c:376
+#: common/simple-pwquery.c:373
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossibile connettersi a `%s': %s\n"
 
-#: common/simple-pwquery.c:387
+#: common/simple-pwquery.c:384
 msgid "communication problem with gpg-agent\n"
 msgstr "problema di comunicazione con gpg-agent\n"
 
-#: common/simple-pwquery.c:397
+#: common/simple-pwquery.c:394
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "problema con l'agent: ha restituito 0x%lx\n"
 
-#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+#: common/simple-pwquery.c:557 common/simple-pwquery.c:653
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "interrotto dall'utente\n"
 
-#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+#: common/simple-pwquery.c:572 common/simple-pwquery.c:659
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problema con l'agent: ha restituito 0x%lx\n"
@@ -861,7 +872,7 @@ msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
 msgid "not human readable"
 msgstr "non leggibile"
 
-#: g10/card-util.c:62 g10/card-util.c:305
+#: g10/card-util.c:62 g10/card-util.c:308
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la chiave segreta non � disponibile"
@@ -871,167 +882,167 @@ msgstr "la chiave segreta non � disponibile"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1391 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "impossibile fare questo in modo batch\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
 #: g10/keygen.c:1644
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
-#: g10/card-util.c:215 g10/card-util.c:265
+#: g10/card-util.c:218 g10/card-util.c:268
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:412
+#: g10/card-util.c:415
 #, fuzzy
 msgid "male"
 msgstr "abilita"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 #, fuzzy
 msgid "female"
 msgstr "abilita"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 #, fuzzy
 msgid "unspecified"
 msgstr "Nessuna ragione specificata"
 
 # ??? (Md)
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 #, fuzzy
 msgid "not forced"
 msgstr "non esaminato"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:521
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:523
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:525
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:539
+#: g10/card-util.c:542
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:544
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:562
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:580
+#: g10/card-util.c:583
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "non c'� una chiave pubblica corrispondente: %s\n"
 
-#: g10/card-util.c:588
+#: g10/card-util.c:591
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
+#: g10/card-util.c:689 g10/card-util.c:758 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/card-util.c:694
+#: g10/card-util.c:697
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:704
+#: g10/card-util.c:707
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:763
+#: g10/card-util.c:766
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:773
+#: g10/card-util.c:776
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:793
+#: g10/card-util.c:796
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenze aggiornate"
 
-#: g10/card-util.c:801
+#: g10/card-util.c:804
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:813
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/card-util.c:831
+#: g10/card-util.c:834
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:845
+#: g10/card-util.c:848
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "errore: impronta digitale non valida\n"
 
-#: g10/card-util.c:866
+#: g10/card-util.c:869
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra le impronte digitali"
 
-#: g10/card-util.c:889
+#: g10/card-util.c:892
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "errore: impronta digitale non valida\n"
 
-#: g10/card-util.c:937
+#: g10/card-util.c:940
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:941
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/card-util.c:947
+#: g10/card-util.c:950
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/card-util.c:1031
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1051 g10/card-util.c:1060
+#: g10/card-util.c:1054 g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1075
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1084
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1039,136 +1050,136 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1115
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/card-util.c:1117 g10/card-util.c:1194
+#: g10/card-util.c:1120 g10/card-util.c:1197
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/card-util.c:1118 g10/card-util.c:1196
+#: g10/card-util.c:1121 g10/card-util.c:1199
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1198
+#: g10/card-util.c:1122 g10/card-util.c:1201
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1135 g10/card-util.c:1214 g10/keyedit.c:945
+#: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
 #: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/card-util.c:1191
+#: g10/card-util.c:1194
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Per favore scegli il motivo della revoca:\n"
 
-#: g10/card-util.c:1226
+#: g10/card-util.c:1229
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo di protezione sconosciuto\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1234
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1239
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/card-util.c:1304 g10/keyedit.c:1362
+#: g10/card-util.c:1307 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "abbandona questo men�"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1309
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1307 g10/keyedit.c:1365
+#: g10/card-util.c:1310 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1312
 #, fuzzy
 msgid "list all available data"
 msgstr "Chiave disponibile presso: "
 
-#: g10/card-util.c:1312
+#: g10/card-util.c:1315
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1313
+#: g10/card-util.c:1316
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1317
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1315
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia la data di scadenza"
 
-#: g10/card-util.c:1316
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia il valore di fiducia"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1320
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1322
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1323
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1324
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1325
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442 g10/keyedit.c:1634
+#: g10/card-util.c:1445 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1480
+#: g10/card-util.c:1483
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1511
+#: g10/card-util.c:1514
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1513
+#: g10/card-util.c:1516
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/card-util.c:1587 g10/keyedit.c:2255
+#: g10/card-util.c:1590 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
@@ -1176,7 +1187,7 @@ msgstr "Comando non valido  (prova \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
@@ -1492,7 +1503,7 @@ msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1508,27 +1519,27 @@ msgstr "|[file]|fai una firma"
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/gpg.c:372 sm/gpgsm.c:244
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/gpg.c:375 sm/gpgsm.c:246
+#: g10/gpg.c:375 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/gpg.c:377 sm/gpgsm.c:247
+#: g10/gpg.c:377 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:248
+#: g10/gpg.c:379 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:381 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "elenca le chiavi"
 
@@ -1541,11 +1552,11 @@ msgstr "elenca le chiavi e le firme"
 msgid "list and check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/gpg.c:385 sm/gpgsm.c:254
+#: g10/gpg.c:385 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/gpg.c:386 sm/gpgsm.c:252
+#: g10/gpg.c:386 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
@@ -1581,11 +1592,11 @@ msgstr "genera un certificato di revoca"
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/gpg.c:397 sm/gpgsm.c:257
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
@@ -1621,11 +1632,11 @@ msgstr "aggiorna il database della fiducia"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/gpg.c:430 sm/gpgsm.c:262
+#: g10/gpg.c:430 sm/gpgsm.c:264
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
 #: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1636,31 +1647,31 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:279
+#: g10/gpg.c:434 sm/gpgsm.c:281
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/gpg.c:436 sm/gpgsm.c:291
+#: g10/gpg.c:436 sm/gpgsm.c:293
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/gpg.c:447 sm/gpgsm.c:327
+#: g10/gpg.c:447 sm/gpgsm.c:331
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/gpg.c:448 sm/gpgsm.c:330
+#: g10/gpg.c:448 sm/gpgsm.c:334
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:332
+#: g10/gpg.c:453 sm/gpgsm.c:336
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
@@ -1676,7 +1687,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:393
+#: g10/gpg.c:553 sm/gpgsm.c:397
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1684,7 +1695,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:396
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1722,7 +1733,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:532
+#: g10/gpg.c:781 sm/gpgsm.c:538
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1750,7 +1761,7 @@ msgstr "Compressione: "
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:669
+#: g10/gpg.c:1045 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
@@ -1826,465 +1837,465 @@ msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1554
+#: 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:1556
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1562
+#: 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:1564
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1827
+#: g10/gpg.c:1825
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1981
 #, 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:2243 g10/gpg.c:2884 g10/gpg.c:2896
+#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/gpg.c:2401 g10/gpg.c:2413
+#: g10/gpg.c:2399 g10/gpg.c:2411
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2493
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4084
+#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2528
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2531
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2538
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2541
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2548
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2551
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2558
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2561
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2569
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2571
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2573
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2575
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2579
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2581
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2585
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2587
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2589
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2591
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2598
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2608
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2782
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2787
+#: g10/gpg.c:2785
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2873 sm/gpgsm.c:1220
+#: g10/gpg.c:2871 sm/gpgsm.c:1247
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2875
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2884
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2887
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2902
 #, 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:2918
+#: g10/gpg.c:2916
 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:2924
+#: g10/gpg.c:2922
 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:2930
+#: g10/gpg.c:2928
 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:2943
+#: g10/gpg.c:2941
 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:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
+#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1303
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
+#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1311
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3025
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3040
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3042
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3044
 #, 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:3048
+#: g10/gpg.c:3046
 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:3050
+#: g10/gpg.c:3048
 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:3053
+#: g10/gpg.c:3051
 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:3057
+#: g10/gpg.c:3055
 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:3064
+#: g10/gpg.c:3062
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3071
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3075
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3079
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/gpg.c:3114
+#: g10/gpg.c:3112
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3159
 #, 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:3166
+#: g10/gpg.c:3164
 #, 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:3171
+#: g10/gpg.c:3169
 #, 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:3263
+#: g10/gpg.c:3261
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3272
 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:3295
+#: g10/gpg.c:3293
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3300
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3302
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3312
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3325
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3327
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3332
+#: g10/gpg.c:3330
 #, 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:3350
+#: g10/gpg.c:3348
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3361
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3376
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3378
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3381
 #, 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:3403
+#: g10/gpg.c:3401
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3410
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3435
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3443
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3447
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3468
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3553
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3557
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3568
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/gpg.c:3580
+#: g10/gpg.c:3578
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/gpg.c:3631
+#: g10/gpg.c:3629
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3639
+#: g10/gpg.c:3637
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3729
+#: g10/gpg.c:3727
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3844
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/gpg.c:3850
+#: g10/gpg.c:3848
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4160
 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:4162
 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:4195
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
@@ -2297,7 +2308,7 @@ msgstr "prende le chiavi da questo portachiavi"
 msgid "make timestamp conflicts only a warning"
 msgstr "segnala i conflitti di data solo con un avvertimento"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:368
+#: g10/gpgv.c:75 sm/gpgsm.c:372
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato sul FD"
 
@@ -6789,64 +6800,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: scd/scdaemon.c:105
+#: scd/scdaemon.c:108
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:357
+#: scd/scdaemon.c:114 sm/gpgsm.c:361
 #, fuzzy
 msgid "read options from file"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:124
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:129
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "non usa per niente il terminale"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:134
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:135
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "comandi in conflitto\n"
 
-#: scd/scdaemon.c:206
+#: scd/scdaemon.c:209
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: scd/scdaemon.c:208
+#: scd/scdaemon.c:211
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:671
+#: scd/scdaemon.c:658
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1019
+#: scd/scdaemon.c:1006
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1024
+#: scd/scdaemon.c:1011
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6875,143 +6886,257 @@ msgstr "la versione %d del protocollo di gpg-agent non � gestita\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:174
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr ""
+
+#: sm/certchain.c:195
+msgid "chain"
+msgstr ""
+
+#: sm/certchain.c:196
+#, fuzzy
+msgid "shell"
+msgstr "help"
+
+#: sm/certchain.c:241
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "la versione %d del protocollo di gpg-agent non � gestita\n"
 
-#: sm/certchain.c:212
+#: sm/certchain.c:279
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:250
+#: sm/certchain.c:317
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:260
+#: sm/certchain.c:327
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: sm/certchain.c:267 sm/certchain.c:296
+#: sm/certchain.c:334 sm/certchain.c:363
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:271 sm/certchain.c:300
+#: sm/certchain.c:338 sm/certchain.c:367
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: sm/certchain.c:411
+#: sm/certchain.c:478
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:431
+#: sm/certchain.c:498
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: sm/certchain.c:675
+#: sm/certchain.c:742
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: la chiave � stata revocata"
 
-#: sm/certchain.c:684
+#: sm/certchain.c:752
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "certificato danneggiato"
 
-#: sm/certchain.c:688
+#: sm/certchain.c:757
+msgid "the status of the certificate is unknown"
+msgstr ""
+
+#: sm/certchain.c:762
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Chiave disponibile presso: "
 
-#: sm/certchain.c:690
+#: sm/certchain.c:764
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:695
+#: sm/certchain.c:770
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: sm/certchain.c:791
-#, fuzzy
-msgid "no issuer found in certificate"
-msgstr "genera un certificato di revoca"
-
-#: sm/certchain.c:820
+#: sm/certchain.c:799 sm/certchain.c:867
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:836
+#: sm/certchain.c:814 sm/certchain.c:899
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:849
+#: sm/certchain.c:815 sm/certchain.c:900
+#, fuzzy
+msgid "root certificate not yet valid"
+msgstr "scrittura della chiave segreta in `%s'\n"
+
+#: sm/certchain.c:816 sm/certchain.c:901
+msgid "intermediate certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:829
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Questa chiave � scaduta!"
 
-#: sm/certchain.c:892
-msgid "self-signed certificate has a BAD signature"
+#: sm/certchain.c:830
+#, fuzzy
+msgid "root certificate has expired"
+msgstr "Questa chiave � scaduta!"
+
+#: sm/certchain.c:831
+#, fuzzy
+msgid "intermediate certificate has expired"
+msgstr "Questa chiave � scaduta!"
+
+#: sm/certchain.c:873
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:960
-msgid "root certificate is not marked trusted"
+#: sm/certchain.c:882
+#, fuzzy
+msgid "certificate with invalid validity"
+msgstr "Questa chiave � scaduta!"
+
+#: sm/certchain.c:919
+msgid "signature not created during lifetime of certificate"
+msgstr ""
+
+#: sm/certchain.c:921
+msgid "certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:922
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:926
+#, fuzzy
+msgid "  (  signature created at "
+msgstr "           nuove firme: %lu\n"
+
+#: sm/certchain.c:927
+#, fuzzy
+msgid "  (certificate created at "
+msgstr "Certificato di revoca creato.\n"
+
+#: sm/certchain.c:930
+#, fuzzy
+msgid "  (certificate valid from "
+msgstr "certificato danneggiato"
+
+#: sm/certchain.c:931
+msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:975
+#: sm/certchain.c:961
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "mostra le impronte digitali"
 
-#: sm/certchain.c:983
+#: sm/certchain.c:970
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:998
+#: sm/certchain.c:983
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1004
+#: sm/certchain.c:989
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1046
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr ""
+
+#: sm/certchain.c:1110
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "genera un certificato di revoca"
+
+#: sm/certchain.c:1184
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:1253
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:1266
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: sm/certchain.c:1041 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1053
+#: sm/certchain.c:1307
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1086
+#: sm/certchain.c:1340
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifica una firma"
 
-#: sm/certchain.c:1116
+#: sm/certchain.c:1371
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1167
+#: sm/certchain.c:1422
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
+#: sm/certchain.c:1462 sm/certchain.c:1730
+#, fuzzy
+msgid "certificate is good\n"
+msgstr "la preferenza %c%lu � doppia\n"
+
+#: sm/certchain.c:1463
+#, fuzzy
+msgid "intermediate certificate is good\n"
+msgstr "Certificato di revoca creato.\n"
+
+#: sm/certchain.c:1464
+#, fuzzy
+msgid "root certificate is good\n"
+msgstr "certificato danneggiato"
+
+#: sm/certchain.c:1620
+msgid "switching to chain model"
+msgstr ""
+
+#: sm/certchain.c:1629
+#, c-format
+msgid "validation model used: %s"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "chain model"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "shell model"
+msgstr ""
+
 #: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
@@ -7059,7 +7184,7 @@ msgstr "errore: impronta digitale non valida\n"
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
 "\"%s\"\n"
-"S/N %s, ID %08lX, created %s"
+"S/N %s, ID 0x%08lX, created %s"
 msgstr ""
 "Ti serve una passphrase per sbloccare la chiave segreta dell'utente:\n"
 "\"%.*s\"\n"
@@ -7069,7 +7194,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:131 sm/keylist.c:255
+#: sm/certlist.c:131 sm/keylist.c:258
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
@@ -7191,181 +7316,181 @@ msgstr "errore nella creazione della passhprase: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "scrittura in `%s'\n"
 
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: sm/gpgsm.c:251
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list external keys"
 msgstr "elenca le chiavi segrete"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list certificate chain"
 msgstr "certificato danneggiato"
 
-#: sm/gpgsm.c:256
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "import certificates"
 msgstr "certificato danneggiato"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:262
 #, fuzzy
 msgid "export certificates"
 msgstr "certificato danneggiato"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:268
 #, fuzzy
 msgid "change a passphrase"
 msgstr "cambia la passphrase"
 
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crea un output ascii con armatura"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:287
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:296
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:302
+#: sm/gpgsm.c:304
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:305
+#: sm/gpgsm.c:309
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:312
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:315
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:319
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:323
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:325
 msgid "use the default key as default recipient"
 msgstr "usa la chiave predefinita come destinatario predefinito"
 
-#: sm/gpgsm.c:338
+#: sm/gpgsm.c:342
 msgid "don't use the terminal at all"
 msgstr "non usa per niente il terminale"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:346
 msgid "force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:347
 msgid "always use a MDC for encryption"
 msgstr "usa sempre un MDC per cifrare"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:352
 msgid "batch mode: never ask"
 msgstr "modo batch: non fa domande"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:353
 msgid "assume yes on most questions"
 msgstr "risponde \"s�\" a quasi tutte le domande"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:354
 msgid "assume no on most questions"
 msgstr "risponde \"no\" a quasi tutte le domande"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:356
 msgid "add this keyring to the list of keyrings"
 msgstr "aggiungi questo portachiavi alla lista"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:357
 msgid "add this secret keyring to the list"
 msgstr "aggiungi questo portachiavi segreto alla lista"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usa NOME come chiave segreta predefinita"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:359
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|cerca le chiavi in questo keyserver"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:360
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOME|imposta NOME come set di caratteri del terminale"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:364
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:375
+#: sm/gpgsm.c:379
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: sm/gpgsm.c:381
+#: sm/gpgsm.c:385
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di cifratura NOME"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:387
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di message digest NOME"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:389
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritmo di compressione N"
 
-#: sm/gpgsm.c:522
+#: sm/gpgsm.c:528
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: sm/gpgsm.c:525
+#: sm/gpgsm.c:531
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7376,31 +7501,36 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: sm/gpgsm.c:604
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: sm/gpgsm.c:685
+#: sm/gpgsm.c:691
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "impossibile connettersi a `%s': %s\n"
 
-#: sm/gpgsm.c:1237
+#: sm/gpgsm.c:713
+#, fuzzy, c-format
+msgid "unknown validation model `%s'\n"
+msgstr "destinatario predefinito `%s' sconosciuto\n"
+
+#: sm/gpgsm.c:1264
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1316
+#: sm/gpgsm.c:1344
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: sm/gpgsm.c:1334
+#: sm/gpgsm.c:1362
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "impossibile chiudere `%s': %s\n"
 
-#: sm/gpgsm.c:1529
+#: sm/gpgsm.c:1543
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7423,7 +7553,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:375
+#: sm/import.c:541 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "errore leggendo `%s': %s\n"
@@ -7507,7 +7637,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234
+#: sm/qualified.c:234 sm/verify.c:536
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7526,30 +7656,37 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: sm/verify.c:386
+#: sm/verify.c:388
 #, fuzzy
 msgid "Signature made "
 msgstr "Firma scaduta il %s\n"
 
-#: sm/verify.c:390
+#: sm/verify.c:392
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:391
-#, c-format
-msgid " using certificate ID %08lX\n"
-msgstr ""
+#: sm/verify.c:393
+#, fuzzy, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr "errore nella creazione della passhprase: %s\n"
 
-#: sm/verify.c:507
+#: sm/verify.c:514
 #, fuzzy
 msgid "Good signature from"
 msgstr "Firma valida da \""
 
-#: sm/verify.c:508
+#: sm/verify.c:515
 #, fuzzy
 msgid "                aka"
 msgstr "                alias \""
 
+#: sm/verify.c:533
+#, fuzzy
+msgid "This is a qualified signature\n"
+msgstr ""
+"\n"
+"Questa sar� una autofirma.\n"
+
 #: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
@@ -7586,132 +7723,137 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:315
+#: tools/gpg-connect-agent.c:314
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:323
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:382
+#: tools/gpg-connect-agent.c:381
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "riga troppo lunga\n"
 
-#: tools/gpg-connect-agent.c:386
+#: tools/gpg-connect-agent.c:385
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:458
+#: tools/gpg-connect-agent.c:457
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: tools/gpg-connect-agent.c:466
+#: tools/gpg-connect-agent.c:465
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "firma fallita: %s\n"
 
-#: tools/gpg-connect-agent.c:474
+#: tools/gpg-connect-agent.c:473
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: tools/gpg-connect-agent.c:784
+#: tools/gpg-connect-agent.c:789
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:793
+#: tools/gpg-connect-agent.c:798
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
+#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
-#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
+#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
-#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:501
+#: tools/gpgconf-comp.c:492
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:505
+#: tools/gpgconf-comp.c:496
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:509
+#: tools/gpgconf-comp.c:500
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:510
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:638
+#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#, fuzzy
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NOME|cifra per NOME"
+
+#: tools/gpgconf-comp.c:635
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:640
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
 
-#: tools/gpgconf-comp.c:705
+#: tools/gpgconf-comp.c:708
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:749
+#: tools/gpgconf-comp.c:752
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:785
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:806
+#: tools/gpgconf-comp.c:809
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:814
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:848
+#: tools/gpgconf-comp.c:851
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2681
+#: tools/gpgconf-comp.c:2684
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8335,9 +8477,6 @@ msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 #~ msgid "q"
 #~ msgstr "q"
 
-#~ msgid "help"
-#~ msgstr "help"
-
 #~ msgid "list"
 #~ msgstr "list"
 
diff --git a/po/ja.po b/po/ja.po
index 4965b486e..86b06c081 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-07-05 18:01+0200\n"
+"POT-Creation-Date: 2007-08-10 15:49+0200\n"
 "PO-Revision-Date: 2004-11-23 11:14+0900\n"
 "Last-Translator: IIDA Yosiaki <iida@gnu.org>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -22,54 +22,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: agent/call-pinentry.c:426
+#: agent/call-pinentry.c:436
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:429
+#: agent/call-pinentry.c:439
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/call-pinentry.c:476
+#: agent/call-pinentry.c:486
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
+#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
 #, fuzzy
 msgid "PIN too long"
 msgstr "�Ԥ�Ĺ�����ޤ�"
 
-#: agent/call-pinentry.c:497
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "�ѥ��ե졼����Ĺ�����ޤ�\n"
 
-#: agent/call-pinentry.c:505
+#: agent/call-pinentry.c:515
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:520
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:522
+#: agent/call-pinentry.c:532
 #, fuzzy
 msgid "Bad PIN"
 msgstr "������MPI�Ǥ�"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:533
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "�ѥ��ե졼���������Ǥ�"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:569
 #, fuzzy
 msgid "Passphrase"
 msgstr "�ѥ��ե졼���������Ǥ�"
@@ -86,14 +86,14 @@ msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 msgid "can't create `%s': %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
 #: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
-#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1796
+#: sm/gpgsm.c:1833 sm/gpgsm.c:1871 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
@@ -180,35 +180,46 @@ msgstr[1] ""
 msgid "Take this one anyway"
 msgstr "����Ǥ⤳�θ���Ȥ��ޤ���? (y/N) "
 
-#: agent/genkey.c:99
+#: agent/genkey.c:99 agent/genkey.c:114
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "�ѥ��ե졼��������\n"
 
-#: agent/genkey.c:144
+#: agent/genkey.c:107
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+
+#: agent/genkey.c:113
+msgid "Yes, protection is not needed"
+msgstr ""
+
+#: agent/genkey.c:158
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
+#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
 #: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:263
+#: agent/genkey.c:280
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -218,247 +229,247 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:103
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
-#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
 #: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "��Ĺ"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
-#: sm/gpgsm.c:337
+#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "����Ť�"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:109
+#: agent/gpg-agent.c:118 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:119
+#: agent/gpg-agent.c:125 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:125
+#: agent/gpg-agent.c:126
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "�������С��θ��򸡺�����"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:129
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:145
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:206 sm/gpgsm.c:525 tools/gpg-connect-agent.c:124
 #: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "�Х��򸫤Ĥ����� <gnupg-bugs@gnu.org> �ޤǤ���𤯤�������\n"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:262
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
+#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
-#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:340 sm/gpgsm.c:772 sm/gpgsm.c:775 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
+#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:863
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
-#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
-#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: scd/scdaemon.c:421 sm/gpgsm.c:867 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
+#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:874
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "��%s�פκ������顼: %s\n"
 
-#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
-#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:921
+#: agent/gpg-agent.c:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
+#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:908
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
+#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
+#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "��%s�פǿ��ѥ쥳���ɤθ������顼: %s\n"
 
-#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
+#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
+#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ��Ǥ��ޤ���\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1377
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d)��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1381
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1497
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1519
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
+#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
+#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: �����å�: %s\n"
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1752
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:751
+#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
 
-#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
-#: tools/gpg-connect-agent.c:762
+#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
@@ -523,42 +534,42 @@ msgstr "�ѥ��ե졼���κ������顼: %s\n"
 msgid "cancelled\n"
 msgstr "����󥻥�"
 
-#: agent/trustlist.c:131 agent/trustlist.c:319
+#: agent/trustlist.c:132 agent/trustlist.c:322
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "��%s�פǥ��顼: %s\n"
 
-#: agent/trustlist.c:146
+#: agent/trustlist.c:147
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: agent/trustlist.c:166 agent/trustlist.c:174
+#: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:180
+#: agent/trustlist.c:181
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "��̩��ʬ�������ޤ���\n"
 
-#: agent/trustlist.c:215
+#: agent/trustlist.c:216
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: agent/trustlist.c:241 agent/trustlist.c:248
+#: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:280
+#: agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: agent/trustlist.c:381 agent/trustlist.c:420
+#: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -571,7 +582,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:496
+#: agent/trustlist.c:507
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -581,7 +592,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:505
+#: agent/trustlist.c:516
 msgid "Correct"
 msgstr ""
 
@@ -593,58 +604,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:525
+#: agent/trustlist.c:536
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 #, fuzzy
 msgid "Yes"
 msgstr "yes"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:393
+#: common/exechelp.c:302 common/exechelp.c:390
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: common/exechelp.c:369 common/exechelp.c:426
+#: common/exechelp.c:366 common/exechelp.c:423
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "��̾���줿�ǡ�����%s�פ������ޤ���\n"
 
-#: common/exechelp.c:405 common/exechelp.c:635
+#: common/exechelp.c:402 common/exechelp.c:632
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: common/exechelp.c:461 common/exechelp.c:504
+#: common/exechelp.c:458 common/exechelp.c:501
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:469
+#: common/exechelp.c:466
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "���Ը�����μ������顼: %s\n"
 
-#: common/exechelp.c:475 common/exechelp.c:515
+#: common/exechelp.c:472 common/exechelp.c:512
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: common/exechelp.c:510
+#: common/exechelp.c:507
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:521
+#: common/exechelp.c:518
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
@@ -663,26 +674,26 @@ msgstr "[�桼����ID�����Ĥ���ޤ���]"
 msgid "gpg-agent is not available in this session\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: common/simple-pwquery.c:376
+#: common/simple-pwquery.c:373
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "��%s�פ���³�Ǥ��ޤ���: %s\n"
 
-#: common/simple-pwquery.c:387
+#: common/simple-pwquery.c:384
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agent�Ȥ��̿��㳲\n"
 
-#: common/simple-pwquery.c:397
+#: common/simple-pwquery.c:394
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
 
-#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+#: common/simple-pwquery.c:557 common/simple-pwquery.c:653
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "�桼�����ˤ���ä�\n"
 
-#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+#: common/simple-pwquery.c:572 common/simple-pwquery.c:659
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
@@ -860,7 +871,7 @@ msgstr "�ٹ�: ̵��������ǡ�����ȯ��\n"
 msgid "not human readable"
 msgstr "�ͤˤ��ɤ�ޤ���"
 
-#: g10/card-util.c:62 g10/card-util.c:305
+#: g10/card-util.c:62 g10/card-util.c:308
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP�����ɤ�̵���Ǥ�: %s\n"
@@ -870,153 +881,153 @@ msgstr "OpenPGP�����ɤ�̵���Ǥ�: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP������no. %s�򸡽�\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1391 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "����ϥХå����⡼�ɤǤϤǤ��ޤ���\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
 #: g10/keygen.c:1644
 msgid "Your selection? "
 msgstr "�����? "
 
-#: g10/card-util.c:215 g10/card-util.c:265
+#: g10/card-util.c:218 g10/card-util.c:268
 msgid "[not set]"
 msgstr "[̤����]"
 
-#: g10/card-util.c:412
+#: g10/card-util.c:415
 msgid "male"
 msgstr "��"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "female"
 msgstr "��"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "unspecified"
 msgstr "̵����"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "not forced"
 msgstr "̤����"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "forced"
 msgstr "����"
 
-#: g10/card-util.c:518
+#: g10/card-util.c:521
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "���顼�� �Τ٤����ASCII�������������Ĥ���Ƥ��ޤ���\n"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:523
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "���顼: ��<��ʸ���ϻȤ��ޤ���\n"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:525
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "���顼: ��Ťζ���϶ػߤǤ���\n"
 
-#: g10/card-util.c:539
+#: g10/card-util.c:542
 msgid "Cardholder's surname: "
 msgstr "�����ɽ�ͭ�Ԥ��� (surname): "
 
-#: g10/card-util.c:541
+#: g10/card-util.c:544
 msgid "Cardholder's given name: "
 msgstr "�����ɽ�ͭ�Ԥ�̾ (given name): "
 
-#: g10/card-util.c:559
+#: g10/card-util.c:562
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "���顼: �Ĥʤ���̾����Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:580
+#: g10/card-util.c:583
 msgid "URL to retrieve public key: "
 msgstr "��������õ������URL: "
 
-#: g10/card-util.c:588
+#: g10/card-util.c:591
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "���顼: URL��Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
+#: g10/card-util.c:689 g10/card-util.c:758 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: g10/card-util.c:694
+#: g10/card-util.c:697
 msgid "Login data (account name): "
 msgstr "�������󡦥ǡ��� (���������̾): "
 
-#: g10/card-util.c:704
+#: g10/card-util.c:707
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "���顼: �������󡦥ǡ�����Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:763
+#: g10/card-util.c:766
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:773
+#: g10/card-util.c:776
 #, fuzzy, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "���顼: URL��Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:793
+#: g10/card-util.c:796
 msgid "Language preferences: "
 msgstr "���������: "
 
-#: g10/card-util.c:801
+#: g10/card-util.c:804
 msgid "Error: invalid length of preference string.\n"
 msgstr "���顼: ����ʸ�����Ĺ����̵���Ǥ���\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:813
 msgid "Error: invalid characters in preference string.\n"
 msgstr "���顼: ����ʸ�����̵����ʸ��������ޤ���\n"
 
-#: g10/card-util.c:831
+#: g10/card-util.c:834
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "���� ((M)�ˡ�(F)��������): "
 
-#: g10/card-util.c:845
+#: g10/card-util.c:848
 msgid "Error: invalid response.\n"
 msgstr "���顼: ̵���ʱ�����\n"
 
-#: g10/card-util.c:866
+#: g10/card-util.c:869
 msgid "CA fingerprint: "
 msgstr "CA���: "
 
-#: g10/card-util.c:889
+#: g10/card-util.c:892
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "���顼: ̵���ʷ����λ��档\n"
 
-#: g10/card-util.c:937
+#: g10/card-util.c:940
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "�������Ǥ��ޤ���: %s\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:941
 msgid "not an OpenPGP card"
 msgstr "OpenPGP�����ɤǤ���ޤ���"
 
-#: g10/card-util.c:947
+#: g10/card-util.c:950
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "���Ը�����μ������顼: %s\n"
 
-#: g10/card-util.c:1031
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr "��¸�θ���򴹤��ޤ���? (y/N) "
 
-#: g10/card-util.c:1051 g10/card-util.c:1060
+#: g10/card-util.c:1054 g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "�Ź渰�򥫡��ɳ��˥Хå����åפ��ޤ���? (Y/n) "
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1075
 msgid "Replace existing keys? (y/N) "
 msgstr "��¸�θ�����򴹤��ޤ���? (y/N) "
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1084
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1027,120 +1038,120 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "���Υ��ޥ�ɤ�Ȥä��ѹ����٤��Ǥ� --change-pin\n"
 
-#: g10/card-util.c:1115
+#: g10/card-util.c:1118
 msgid "Please select the type of key to generate:\n"
 msgstr "�������븰�η������򤷤Ƥ�������:\n"
 
-#: g10/card-util.c:1117 g10/card-util.c:1194
+#: g10/card-util.c:1120 g10/card-util.c:1197
 msgid "   (1) Signature key\n"
 msgstr "   (1) ��̾��\n"
 
-#: g10/card-util.c:1118 g10/card-util.c:1196
+#: g10/card-util.c:1121 g10/card-util.c:1199
 msgid "   (2) Encryption key\n"
 msgstr "   (2) �Ź沽��\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1198
+#: g10/card-util.c:1122 g10/card-util.c:1201
 msgid "   (3) Authentication key\n"
 msgstr "   (3) ǧ�ڸ�\n"
 
-#: g10/card-util.c:1135 g10/card-util.c:1214 g10/keyedit.c:945
+#: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
 #: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "̵��������Ǥ���\n"
 
-#: g10/card-util.c:1191
+#: g10/card-util.c:1194
 msgid "Please select where to store the key:\n"
 msgstr "�����ݴɾ������򤷤Ƥ�������:\n"
 
-#: g10/card-util.c:1226
+#: g10/card-util.c:1229
 msgid "unknown key protection algorithm\n"
 msgstr "̤�Τθ��ݸ�르�ꥺ��Ǥ�\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1234
 msgid "secret parts of key are not available\n"
 msgstr "������̩��ʬ��̵���Ǥ�\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1239
 msgid "secret key already stored on a card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/card-util.c:1304 g10/keyedit.c:1362
+#: g10/card-util.c:1307 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "���Υ�˥塼��λ"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1309
 msgid "show admin commands"
 msgstr "�������ޥ�ɤ�ɽ��"
 
-#: g10/card-util.c:1307 g10/keyedit.c:1365
+#: g10/card-util.c:1310 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "���Υإ�פ�ɽ��"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1312
 msgid "list all available data"
 msgstr "��ͭ���ǡ�����ɽ��"
 
-#: g10/card-util.c:1312
+#: g10/card-util.c:1315
 msgid "change card holder's name"
 msgstr "�����ɽ�ͭ�Ԥ�̾�����ѹ�"
 
-#: g10/card-util.c:1313
+#: g10/card-util.c:1316
 msgid "change URL to retrieve key"
 msgstr "����õ������URL���ѹ�"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1317
 msgid "fetch the key specified in the card URL"
 msgstr "������URL�ǻ��ꤵ�줿���ΰ����Ф�"
 
-#: g10/card-util.c:1315
+#: g10/card-util.c:1318
 msgid "change the login name"
 msgstr "��������̾���ѹ�"
 
-#: g10/card-util.c:1316
+#: g10/card-util.c:1319
 msgid "change the language preferences"
 msgstr "�����������ѹ�"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1320
 msgid "change card holder's sex"
 msgstr "�����ɽ�ͭ�Ԥ����̤��ѹ�"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1321
 msgid "change a CA fingerprint"
 msgstr "CA������ѹ�"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1322
 msgid "toggle the signature force PIN flag"
 msgstr "��̾����PIN�ե饰��ȿž"
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1323
 msgid "generate new keys"
 msgstr "����������������"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1324
 msgid "menu to change or unblock the PIN"
 msgstr "PIN�֥��å��β�����ѹ��Υ�˥塼"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1325
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442 g10/keyedit.c:1634
+#: g10/card-util.c:1445 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "���ޥ��> "
 
-#: g10/card-util.c:1480
+#: g10/card-util.c:1483
 msgid "Admin-only command\n"
 msgstr "�������ѥ��ޥ��\n"
 
-#: g10/card-util.c:1511
+#: g10/card-util.c:1514
 msgid "Admin commands are allowed\n"
 msgstr "�������ޥ�ɤ����Ĥ���Ƥ��ޤ�\n"
 
-#: g10/card-util.c:1513
+#: g10/card-util.c:1516
 msgid "Admin commands are not allowed\n"
 msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
 
-#: g10/card-util.c:1587 g10/keyedit.c:2255
+#: g10/card-util.c:1590 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 
@@ -1148,7 +1159,7 @@ msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "��%s�פ������ޤ���\n"
@@ -1441,7 +1452,7 @@ msgstr "����%s��縰%s�����Ѥ��ޤ�\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "��%s: �������Τʤ���̩���Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1457,27 +1468,27 @@ msgstr "|[�ե�����]|��̾�����"
 msgid "|[file]|make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: g10/gpg.c:372 sm/gpgsm.c:244
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "ʬΥ��̾�����"
 
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "�ǡ�����Ź沽"
 
-#: g10/gpg.c:375 sm/gpgsm.c:246
+#: g10/gpg.c:375 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
 
-#: g10/gpg.c:377 sm/gpgsm.c:247
+#: g10/gpg.c:377 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "�ǡ��������� (����)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:248
+#: g10/gpg.c:379 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "��̾�򸡾�"
 
-#: g10/gpg.c:381 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "�����"
 
@@ -1489,11 +1500,11 @@ msgstr "���Ƚ�̾�ΰ���"
 msgid "list and check key signatures"
 msgstr "����̾�θ����Ȱ���"
 
-#: g10/gpg.c:385 sm/gpgsm.c:254
+#: g10/gpg.c:385 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "���Ȼ���ΰ���"
 
-#: g10/gpg.c:386 sm/gpgsm.c:252
+#: g10/gpg.c:386 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "��̩���ΰ���"
 
@@ -1529,11 +1540,11 @@ msgstr "���������������"
 msgid "export keys"
 msgstr "����񤭽Ф�"
 
-#: g10/gpg.c:397 sm/gpgsm.c:257
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "�������С��˸���񤭽Ф�"
 
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "�������С����鸰���ɤ߹���"
 
@@ -1569,11 +1580,11 @@ msgstr "���ѥǡ����١����򹹿�"
 msgid "|algo [files]|print message digests"
 msgstr "|���르�ꥺ�� [�ե�����]|��å����������ɽ��"
 
-#: g10/gpg.c:430 sm/gpgsm.c:262
+#: g10/gpg.c:430 sm/gpgsm.c:264
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
 #: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1584,35 +1595,35 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:279
+#: g10/gpg.c:434 sm/gpgsm.c:281
 msgid "create ascii armored output"
 msgstr "ASCII���������������"
 
-#: g10/gpg.c:436 sm/gpgsm.c:291
+#: g10/gpg.c:436 sm/gpgsm.c:293
 msgid "|NAME|encrypt for NAME"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: g10/gpg.c:447 sm/gpgsm.c:327
+#: g10/gpg.c:447 sm/gpgsm.c:331
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "��̾������ˤ��Υ桼����id\n"
 "�����"
 
-#: g10/gpg.c:448 sm/gpgsm.c:330
+#: g10/gpg.c:448 sm/gpgsm.c:334
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|���̥�٥��N������\n"
 "(0���󰵽�)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:332
+#: g10/gpg.c:453 sm/gpgsm.c:336
 msgid "use canonical text mode"
 msgstr "����ƥ����ȡ��⡼�ɤ����"
 
-#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "���ϥե�����Ȥ��ƻ���"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "̵�ѹ�"
 
@@ -1628,7 +1639,7 @@ msgstr "��̩��OpenPGP�ο�������"
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x�ߴ��Υ�å�����������"
 
-#: g10/gpg.c:553 sm/gpgsm.c:393
+#: g10/gpg.c:553 sm/gpgsm.c:397
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1637,7 +1648,7 @@ msgstr ""
 "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
 "�ޥ˥奢�롦�ڡ���������������)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:396
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1675,7 +1686,7 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:532
+#: g10/gpg.c:781 sm/gpgsm.c:538
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1703,7 +1714,7 @@ msgstr "����: "
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:669
+#: g10/gpg.c:1045 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "��Ω���륳�ޥ��\n"
 
@@ -1779,451 +1790,451 @@ msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "̤�Τι������ܡ�%s��\n"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1552
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1560
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "��̩���ȸ������ΰ�����ȿž"
 
-#: g10/gpg.c:1564
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1827
+#: g10/gpg.c:1825
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1981
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
 
-#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
+#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s�ϻȤ��ޤ���!\n"
 
-#: g10/gpg.c:2401 g10/gpg.c:2413
+#: g10/gpg.c:2399 g10/gpg.c:2411
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2493
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4084
+#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "�������С���URL�������ǽ\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2528
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2531
 msgid "invalid keyserver options\n"
 msgstr "̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2538
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2541
 msgid "invalid import options\n"
 msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2548
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2551
 msgid "invalid export options\n"
 msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2558
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2561
 msgid "invalid list options\n"
 msgstr "̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2569
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2571
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2573
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2575
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2579
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2581
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2585
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2587
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2589
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2591
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2598
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2601
 msgid "invalid verify options\n"
 msgstr "̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2608
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path��%s��������ǽ\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2782
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2787
+#: g10/gpg.c:2785
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2873 sm/gpgsm.c:1220
+#: g10/gpg.c:2871 sm/gpgsm.c:1247
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2875
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�ٹ�: %s��%s���ͥ��\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2884
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2887
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ�˻ȤäƤ�̵��̣�Ǥ�!\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2902
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/gpg.c:2918
+#: g10/gpg.c:2916
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2922
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ沽��Ʊ���ˤǤ��ޤ���\n"
 
-#: g10/gpg.c:2930
+#: g10/gpg.c:2928
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 
-#: g10/gpg.c:2943
+#: g10/gpg.c:2941
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź�ˡ��ɬ�פǤ�\n"
 
-#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
+#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1303
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
+#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1311
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "selected compression algorithm is invalid\n"
 msgstr "���򤵤줿���̥��르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3025
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3040
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3042
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3044
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3046
 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:3050
+#: g10/gpg.c:3048
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "̵����min-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3053
+#: g10/gpg.c:3051
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/gpg.c:3057
+#: g10/gpg.c:3055
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3062
 msgid "invalid default preferences\n"
 msgstr "̵���ʴ��������\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3071
 msgid "invalid personal cipher preferences\n"
 msgstr "̵���ʸĿ��ѰŹ�ˡ������\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3075
 msgid "invalid personal digest preferences\n"
 msgstr "̵���ʸĿ������������\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3079
 msgid "invalid personal compress preferences\n"
 msgstr "̵���ʸĿ��Ѱ��̤�����\n"
 
-#: g10/gpg.c:3114
+#: g10/gpg.c:3112
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3159
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3164
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3171
+#: g10/gpg.c:3169
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3263
+#: g10/gpg.c:3261
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3272
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
 
-#: g10/gpg.c:3295
+#: g10/gpg.c:3293
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3300
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3302
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "��%s�פ��оΰŹ�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3312
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3325
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3327
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3332
+#: g10/gpg.c:3330
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "--symmetric --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3348
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3361
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3376
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3378
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --sign --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3381
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "--symmetric --sign --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3401
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3410
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3435
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3443
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3447
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3468
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3553
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3557
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3568
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3580
+#: g10/gpg.c:3578
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3631
+#: g10/gpg.c:3629
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3639
+#: g10/gpg.c:3637
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3729
+#: g10/gpg.c:3727
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3844
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/gpg.c:3850
+#: g10/gpg.c:3848
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å��������ǤäƤ������� ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4160
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4162
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4195
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
@@ -2235,7 +2246,7 @@ msgstr "���θ����ؤ��������ޤ�"
 msgid "make timestamp conflicts only a warning"
 msgstr "������̷���ٹ�����ˤ��ޤ�"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:368
+#: g10/gpgv.c:75 sm/gpgsm.c:372
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
@@ -6551,61 +6562,61 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s�˥��������Ǥ��ޤ��� - ̵����OpenPGP������?\n"
 
-#: scd/scdaemon.c:105
+#: scd/scdaemon.c:108
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:357
+#: scd/scdaemon.c:114 sm/gpgsm.c:361
 #, fuzzy
 msgid "read options from file"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:124
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:126
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:129
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:134
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:135
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "�������ޥ�ɤ�ɽ��"
 
-#: scd/scdaemon.c:206
+#: scd/scdaemon.c:209
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: scd/scdaemon.c:208
+#: scd/scdaemon.c:211
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:671
+#: scd/scdaemon.c:658
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1019
+#: scd/scdaemon.c:1006
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1024
+#: scd/scdaemon.c:1011
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6634,143 +6645,259 @@ msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:174
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr ""
+
+#: sm/certchain.c:195
+#, fuzzy
+msgid "chain"
+msgstr "admin"
+
+#: sm/certchain.c:196
+#, fuzzy
+msgid "shell"
+msgstr "help"
+
+#: sm/certchain.c:241
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: sm/certchain.c:212
+#: sm/certchain.c:279
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:250
+#: sm/certchain.c:317
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:260
+#: sm/certchain.c:327
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
 
-#: sm/certchain.c:267 sm/certchain.c:296
+#: sm/certchain.c:334 sm/certchain.c:363
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:271 sm/certchain.c:300
+#: sm/certchain.c:338 sm/certchain.c:367
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "��̩���ν�Ф��϶ػߤǤ�\n"
 
-#: sm/certchain.c:411
+#: sm/certchain.c:478
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:431
+#: sm/certchain.c:498
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: sm/certchain.c:675
+#: sm/certchain.c:742
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "����: ���ϼ����ѤߤǤ�"
 
-#: sm/certchain.c:684
+#: sm/certchain.c:752
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "�����ʾ�����Ǥ�"
 
-#: sm/certchain.c:688
+#: sm/certchain.c:757
+msgid "the status of the certificate is unknown"
+msgstr ""
+
+#: sm/certchain.c:762
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "�ʲ��˸�������ޤ�: "
 
-#: sm/certchain.c:690
+#: sm/certchain.c:764
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:695
+#: sm/certchain.c:770
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
 
-#: sm/certchain.c:791
-#, fuzzy
-msgid "no issuer found in certificate"
-msgstr "���������������"
-
-#: sm/certchain.c:820
+#: sm/certchain.c:799 sm/certchain.c:867
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:836
+#: sm/certchain.c:814 sm/certchain.c:899
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:849
+#: sm/certchain.c:815 sm/certchain.c:900
+#, fuzzy
+msgid "root certificate not yet valid"
+msgstr "��̩���ν�Ф��϶ػߤǤ�\n"
+
+#: sm/certchain.c:816 sm/certchain.c:901
+msgid "intermediate certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:829
 #, fuzzy
 msgid "certificate has expired"
 msgstr "���θ�����λ�Ǥ�!"
 
-#: sm/certchain.c:892
-msgid "self-signed certificate has a BAD signature"
+#: sm/certchain.c:830
+#, fuzzy
+msgid "root certificate has expired"
+msgstr "���θ�����λ�Ǥ�!"
+
+#: sm/certchain.c:831
+#, fuzzy
+msgid "intermediate certificate has expired"
+msgstr "���θ�����λ�Ǥ�!"
+
+#: sm/certchain.c:873
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:960
-msgid "root certificate is not marked trusted"
+#: sm/certchain.c:882
+#, fuzzy
+msgid "certificate with invalid validity"
+msgstr "���θ�����λ�Ǥ�!"
+
+#: sm/certchain.c:919
+msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:975
+#: sm/certchain.c:921
+msgid "certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:922
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:926
+#, fuzzy
+msgid "  (  signature created at "
+msgstr "����ޤǤ˺������줿��̾: %lu\n"
+
+#: sm/certchain.c:927
+#, fuzzy
+msgid "  (certificate created at "
+msgstr "����������������\n"
+
+#: sm/certchain.c:930
+#, fuzzy
+msgid "  (certificate valid from "
+msgstr "�����ʾ�����Ǥ�"
+
+#: sm/certchain.c:931
+#, fuzzy
+msgid "  (     issuer valid from "
+msgstr "         �����ɤ����� ="
+
+#: sm/certchain.c:961
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "CA���: "
 
-#: sm/certchain.c:983
+#: sm/certchain.c:970
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:998
+#: sm/certchain.c:983
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1004
+#: sm/certchain.c:989
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1046
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr ""
+
+#: sm/certchain.c:1110
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "���������������"
+
+#: sm/certchain.c:1184
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:1253
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:1266
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
 
-#: sm/certchain.c:1041 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1053
+#: sm/certchain.c:1307
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1086
+#: sm/certchain.c:1340
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "��̾�򸡾�"
 
-#: sm/certchain.c:1116
+#: sm/certchain.c:1371
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1167
+#: sm/certchain.c:1422
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
+#: sm/certchain.c:1462 sm/certchain.c:1730
+#, fuzzy
+msgid "certificate is good\n"
+msgstr "������%s�פν�ʣ\n"
+
+#: sm/certchain.c:1463
+#, fuzzy
+msgid "intermediate certificate is good\n"
+msgstr "����������������\n"
+
+#: sm/certchain.c:1464
+#, fuzzy
+msgid "root certificate is good\n"
+msgstr "�����ʾ�����Ǥ�"
+
+#: sm/certchain.c:1620
+msgid "switching to chain model"
+msgstr ""
+
+#: sm/certchain.c:1629
+#, c-format
+msgid "validation model used: %s"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "chain model"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "shell model"
+msgstr ""
+
 #: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
@@ -6818,7 +6945,7 @@ msgstr "���顼: ̵���ʱ�����\n"
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
 "\"%s\"\n"
-"S/N %s, ID %08lX, created %s"
+"S/N %s, ID 0x%08lX, created %s"
 msgstr ""
 "���Υ桼��������̩���Υ��å���������ˤϥѥ��ե졼��������ޤ�:\n"
 "\"%.*s\"\n"
@@ -6828,7 +6955,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:131 sm/keylist.c:255
+#: sm/certlist.c:131 sm/keylist.c:258
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "���Ը�����μ������顼: %s\n"
@@ -6950,190 +7077,190 @@ msgstr "�ѥ��ե졼���κ������顼: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "%s: �ǥ��쥯�ȥ꡼���쥳���ɤν���ߥ��顼: %s\n"
 
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[�ե�����]|��̾�����"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: sm/gpgsm.c:251
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list external keys"
 msgstr "��̩���ΰ���"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list certificate chain"
 msgstr "�����ʾ�����Ǥ�"
 
-#: sm/gpgsm.c:256
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "�������ؤ��鸰������"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "import certificates"
 msgstr "�����ʾ�����Ǥ�"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:262
 #, fuzzy
 msgid "export certificates"
 msgstr "�����ʾ�����Ǥ�"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 #, fuzzy
 msgid "register a smartcard"
 msgstr "���ޡ��ȥ����ɤظ����ɲ�"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:268
 #, fuzzy
 msgid "change a passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "ASCII���������������"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:287
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:296
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:302
+#: sm/gpgsm.c:304
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:305
+#: sm/gpgsm.c:309
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:312
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:315
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:319
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:323
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:325
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "�����å�: �������ϴ���μ���ͤȤ��Ƥ⤦����ѤߤǤ�\n"
 
-#: sm/gpgsm.c:338
+#: sm/gpgsm.c:342
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:346
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "��̾�μ���"
 
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:347
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:352
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:353
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:354
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:356
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "���θ����ؤ��������ޤ�"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:357
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:359
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:360
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:364
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:375
+#: sm/gpgsm.c:379
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:381
+#: sm/gpgsm.c:385
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "̤�ΤΰŹ楢�르�ꥺ��Ǥ�"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:387
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:389
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "̤�Τΰ��̥��르�ꥺ��Ǥ�"
 
-#: sm/gpgsm.c:522
+#: sm/gpgsm.c:528
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: sm/gpgsm.c:525
+#: sm/gpgsm.c:531
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7144,31 +7271,36 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: sm/gpgsm.c:604
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: sm/gpgsm.c:685
+#: sm/gpgsm.c:691
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "��%s�פ���³�Ǥ��ޤ���: %s\n"
 
-#: sm/gpgsm.c:1237
+#: sm/gpgsm.c:713
+#, fuzzy, c-format
+msgid "unknown validation model `%s'\n"
+msgstr "̤�ΤΥ��ץ�����%s��\n"
+
+#: sm/gpgsm.c:1264
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1316
+#: sm/gpgsm.c:1344
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1334
+#: sm/gpgsm.c:1362
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "��%s�פ˥��������Ǥ��ޤ���: %s\n"
 
-#: sm/gpgsm.c:1529
+#: sm/gpgsm.c:1543
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7191,7 +7323,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "���֤μ������顼: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:375
+#: sm/import.c:541 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
@@ -7275,7 +7407,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234
+#: sm/qualified.c:234 sm/verify.c:536
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7294,30 +7426,35 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
 
-#: sm/verify.c:386
+#: sm/verify.c:388
 #, fuzzy
 msgid "Signature made "
 msgstr "%s�˻ܤ��줿��̾\n"
 
-#: sm/verify.c:390
+#: sm/verify.c:392
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:391
-#, c-format
-msgid " using certificate ID %08lX\n"
-msgstr ""
+#: sm/verify.c:393
+#, fuzzy, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr "���֤μ������顼: %s\n"
 
-#: sm/verify.c:507
+#: sm/verify.c:514
 #, fuzzy
 msgid "Good signature from"
 msgstr "��%s�ɤ������������̾"
 
-#: sm/verify.c:508
+#: sm/verify.c:515
 #, fuzzy
 msgid "                aka"
 msgstr "                ��̾��%s��"
 
+#: sm/verify.c:533
+#, fuzzy
+msgid "This is a qualified signature\n"
+msgstr "���ʽ�̾�ˤʤ�Ǥ��礦��\n"
+
 #: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
@@ -7354,131 +7491,136 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:315
+#: tools/gpg-connect-agent.c:314
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:323
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:382
+#: tools/gpg-connect-agent.c:381
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "�Ԥ�Ĺ�����ޤ�"
 
-#: tools/gpg-connect-agent.c:386
+#: tools/gpg-connect-agent.c:385
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:458
+#: tools/gpg-connect-agent.c:457
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "̤�ΤΥ��ץ�����%s��\n"
 
-#: tools/gpg-connect-agent.c:466
+#: tools/gpg-connect-agent.c:465
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 
-#: tools/gpg-connect-agent.c:474
+#: tools/gpg-connect-agent.c:473
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "�����ɽФ��˼��Ԥ��ޤ���: %s\n"
 
-#: tools/gpg-connect-agent.c:784
+#: tools/gpg-connect-agent.c:789
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: tools/gpg-connect-agent.c:793
+#: tools/gpg-connect-agent.c:798
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "��%s�פǿ��ѥ쥳���ɤθ������顼: %s\n"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
+#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
-#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
+#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
-#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:501
+#: tools/gpgconf-comp.c:492
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:505
+#: tools/gpgconf-comp.c:496
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:509
+#: tools/gpgconf-comp.c:500
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:510
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:638
+#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#, fuzzy
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|̾��|��̾�����Ѥ˰Ź沽"
+
+#: tools/gpgconf-comp.c:635
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:640
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:685
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:705
+#: tools/gpgconf-comp.c:708
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:749
+#: tools/gpgconf-comp.c:752
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:785
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:806
+#: tools/gpgconf-comp.c:809
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:814
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:848
+#: tools/gpgconf-comp.c:851
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2681
+#: tools/gpgconf-comp.c:2684
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8111,12 +8253,6 @@ msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 #~ msgid "q"
 #~ msgstr "q"
 
-#~ msgid "admin"
-#~ msgstr "admin"
-
-#~ msgid "help"
-#~ msgstr "help"
-
 #~ msgid "list"
 #~ msgstr "list"
 
diff --git a/po/nb.po b/po/nb.po
index a88ce93f9..ea0c6241d 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-07-05 18:01+0200\n"
+"POT-Creation-Date: 2007-08-10 15:49+0200\n"
 "PO-Revision-Date: 2006-06-13 20:31+0200\n"
 "Last-Translator: Trond Endrest�l <Trond.Endrestol@fagskolen.gjovik.no>\n"
 "Language-Team: Norwegian Bokm�l <i18n-nb@lister.ping.uio.no>\n"
@@ -23,53 +23,53 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
 
-#: agent/call-pinentry.c:426
+#: agent/call-pinentry.c:436
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:429
+#: agent/call-pinentry.c:439
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 
-#: agent/call-pinentry.c:476
+#: agent/call-pinentry.c:486
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
+#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
 #, fuzzy
 msgid "PIN too long"
 msgstr "for lang linje"
 
-#: agent/call-pinentry.c:497
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "for lang linje"
 
-#: agent/call-pinentry.c:505
+#: agent/call-pinentry.c:515
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Ugyldig tegn i navn\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:520
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:522
+#: agent/call-pinentry.c:532
 #, fuzzy
 msgid "Bad PIN"
 msgstr "ugyldig MPI"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:533
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "ugyldig passfrase"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:569
 #, fuzzy
 msgid "Passphrase"
 msgstr "ugyldig passfrase"
@@ -86,14 +86,14 @@ msgstr ""
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
 #: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
-#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1796
+#: sm/gpgsm.c:1833 sm/gpgsm.c:1871 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �pne �%s�: %s\n"
@@ -180,35 +180,46 @@ msgstr[1] ""
 msgid "Take this one anyway"
 msgstr "Bruke denne n�kkelen likevel? (j/N) "
 
-#: agent/genkey.c:99
+#: agent/genkey.c:99 agent/genkey.c:114
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Tast inn passfrase\n"
 
-#: agent/genkey.c:144
+#: agent/genkey.c:107
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+
+#: agent/genkey.c:113
+msgid "Yes, protection is not needed"
+msgstr ""
+
+#: agent/genkey.c:158
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
 "\n"
 
-#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
+#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "endre passfrasen"
 
-#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
 #: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:263
+#: agent/genkey.c:280
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "endre passfrasen"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -218,245 +229,245 @@ msgstr ""
 "Valg:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:103
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
-#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
 #: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "fyldig output"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
-#: sm/gpgsm.c:337
+#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "v�re noenlunde stille"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:109
+#: agent/gpg-agent.c:118 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "leser valg fra �%s�\n"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:119
+#: agent/gpg-agent.c:125 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:125
+#: agent/gpg-agent.c:126
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "s�ke etter n�kler p� en n�kkelserver"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:129
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "sette en notasjon for de valgte brukeridene"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "ikke oppdat�r tillitsdatabasen etter import"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:145
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:206 sm/gpgsm.c:525 tools/gpg-connect-agent.c:124
 #: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Vennligst rapporter feil til <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:262
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
+#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
-#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:340 sm/gpgsm.c:772 sm/gpgsm.c:775 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
+#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:863
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MERK: ingen standard valgfil �%s�\n"
 
-#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
-#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: scd/scdaemon.c:421 sm/gpgsm.c:867 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "valgfil �%s�: %s\n"
 
-#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
+#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:874
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leser valg fra �%s�\n"
 
-#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
-#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:921
+#: agent/gpg-agent.c:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
+#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:908
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
+#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
+#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
 
-#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
+#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skriver hemmelig n�kkel til �%s�\n"
 
-#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
+#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen �%s� ble opprettet\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1377
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) mislyktes in %s: %s\n"
 
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1381
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1497
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1519
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
+#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "oppdatering av hemmelig mislyktes: %s\n"
 
-#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
+#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: hoppet over: %s\n"
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1752
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:751
+#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
-#: tools/gpg-connect-agent.c:762
+#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr ""
@@ -518,42 +529,42 @@ msgstr "feil ved opprettelse av passfrase: %s\n"
 msgid "cancelled\n"
 msgstr "cancel|cancel"
 
-#: agent/trustlist.c:131 agent/trustlist.c:319
+#: agent/trustlist.c:132 agent/trustlist.c:322
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "feil med �%s�: %s\n"
 
-#: agent/trustlist.c:146
+#: agent/trustlist.c:147
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "valgfil �%s�: %s\n"
 
-#: agent/trustlist.c:166 agent/trustlist.c:174
+#: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:180
+#: agent/trustlist.c:181
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "hemmelig n�kkel er ikke tilgjengelig"
 
-#: agent/trustlist.c:215
+#: agent/trustlist.c:216
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "lesefeil ved �%s�: %s\n"
 
-#: agent/trustlist.c:241 agent/trustlist.c:248
+#: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:280
+#: agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: agent/trustlist.c:381 agent/trustlist.c:420
+#: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -566,7 +577,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:496
+#: agent/trustlist.c:507
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -576,7 +587,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:505
+#: agent/trustlist.c:516
 msgid "Correct"
 msgstr ""
 
@@ -588,58 +599,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:525
+#: agent/trustlist.c:536
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 #, fuzzy
 msgid "Yes"
 msgstr "ja"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:393
+#: common/exechelp.c:302 common/exechelp.c:390
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: common/exechelp.c:369 common/exechelp.c:426
+#: common/exechelp.c:366 common/exechelp.c:423
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "kan ikke �pne n�kkelknippet"
 
-#: common/exechelp.c:405 common/exechelp.c:635
+#: common/exechelp.c:402 common/exechelp.c:632
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: common/exechelp.c:461 common/exechelp.c:504
+#: common/exechelp.c:458 common/exechelp.c:501
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:469
+#: common/exechelp.c:466
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
 
-#: common/exechelp.c:475 common/exechelp.c:515
+#: common/exechelp.c:472 common/exechelp.c:512
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: common/exechelp.c:510
+#: common/exechelp.c:507
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:521
+#: common/exechelp.c:518
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "feil ved lesing av �%s�: %s\n"
@@ -658,24 +669,24 @@ msgstr "[Brukerid ikke funnet]"
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: common/simple-pwquery.c:376
+#: common/simple-pwquery.c:373
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr ""
 
-#: common/simple-pwquery.c:387
+#: common/simple-pwquery.c:384
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:397
+#: common/simple-pwquery.c:394
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+#: common/simple-pwquery.c:557 common/simple-pwquery.c:653
 msgid "canceled by user\n"
 msgstr ""
 
-#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+#: common/simple-pwquery.c:572 common/simple-pwquery.c:659
 msgid "problem with the agent\n"
 msgstr ""
 
@@ -850,7 +861,7 @@ msgstr "ingen gyldig OpenPGP-data funnet.\n"
 msgid "not human readable"
 msgstr ""
 
-#: g10/card-util.c:62 g10/card-util.c:305
+#: g10/card-util.c:62 g10/card-util.c:308
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP-kort er ikke tilgjengelig: %s\n"
@@ -860,153 +871,153 @@ 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:75 g10/card-util.c:1391 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "kan ikke gj�re dette i batchmodus\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
 #: g10/keygen.c:1644
 msgid "Your selection? "
 msgstr "Ditt valg? "
 
-#: g10/card-util.c:215 g10/card-util.c:265
+#: g10/card-util.c:218 g10/card-util.c:268
 msgid "[not set]"
 msgstr "[ikke satt]"
 
-#: g10/card-util.c:412
+#: g10/card-util.c:415
 msgid "male"
 msgstr "mann"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "female"
 msgstr "dame"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "unspecified"
 msgstr "uspesifisert"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "not forced"
 msgstr "ikke tvunget"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "forced"
 msgstr "tvunget"
 
-#: g10/card-util.c:518
+#: g10/card-util.c:521
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Feil: Bare ren ASCII er forel�pig tillatt.\n"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:523
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Feil: Tegnet �<� kan ikke brukes.\n"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:525
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Feil: Doble mellomrom er ikke tillatt.\n"
 
-#: g10/card-util.c:539
+#: g10/card-util.c:542
 msgid "Cardholder's surname: "
 msgstr "Kortholders etternavn: "
 
-#: g10/card-util.c:541
+#: g10/card-util.c:544
 msgid "Cardholder's given name: "
 msgstr "Kortholders fornavn: "
 
-#: g10/card-util.c:559
+#: g10/card-util.c:562
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Feil: Det kombinerte navnet er for langt (grensa g�r ved %d tegn).\n"
 
-#: g10/card-util.c:580
+#: g10/card-util.c:583
 msgid "URL to retrieve public key: "
 msgstr "URL for � hente offentlig n�kkel: "
 
-#: g10/card-util.c:588
+#: g10/card-util.c:591
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Feil: URL er for lang (grensa g�r ved %d tegn).\n"
 
-#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
+#: g10/card-util.c:689 g10/card-util.c:758 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: g10/card-util.c:694
+#: g10/card-util.c:697
 msgid "Login data (account name): "
 msgstr "Logindata (kontonavn): "
 
-#: g10/card-util.c:704
+#: g10/card-util.c:707
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Feil: Logindata er for langt (grensa g�r ved %d tegn).\n"
 
-#: g10/card-util.c:763
+#: g10/card-util.c:766
 msgid "Private DO data: "
 msgstr "Privat DO-data: "
 
-#: g10/card-util.c:773
+#: g10/card-util.c:776
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Feil: Privat DO for lang (grensa g�r ved %d tegn).\n"
 
-#: g10/card-util.c:793
+#: g10/card-util.c:796
 msgid "Language preferences: "
 msgstr "Spr�kpreferanser:"
 
-#: g10/card-util.c:801
+#: g10/card-util.c:804
 msgid "Error: invalid length of preference string.\n"
 msgstr "Feil: ugyldig lengde p� preferansestrengen.\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:813
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Feil: ugyldig tegn i preferansestrengen.\n"
 
-#: g10/card-util.c:831
+#: g10/card-util.c:834
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Kj�nn ((M)ale, (F)emale eller mellomrom): "
 
-#: g10/card-util.c:845
+#: g10/card-util.c:848
 msgid "Error: invalid response.\n"
 msgstr "Feil: ugyldig respons.\n"
 
-#: g10/card-util.c:866
+#: g10/card-util.c:869
 msgid "CA fingerprint: "
 msgstr "CA-fingeravtrykk: "
 
-#: g10/card-util.c:889
+#: g10/card-util.c:892
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Feil: ugyldig formattert fingeravtrykk.\n"
 
-#: g10/card-util.c:937
+#: g10/card-util.c:940
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "n�kkeloperasjonen er umulig: %s\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:941
 msgid "not an OpenPGP card"
 msgstr "ikke et OpenPGP-kort"
 
-#: g10/card-util.c:947
+#: g10/card-util.c:950
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
 
-#: g10/card-util.c:1031
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr "Erstatte eksisterende n�kkel? (j/N) "
 
-#: g10/card-util.c:1051 g10/card-util.c:1060
+#: g10/card-util.c:1054 g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Lage sikkerhetskopi av krypteringsn�kler utenfor kortet? (J/n) "
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1075
 msgid "Replace existing keys? (y/N) "
 msgstr "Erstatte eksisterende n�kler? (j/N) "
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1084
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1017,120 +1028,120 @@ msgstr ""
 "   PIN = �%s�     Admin PIN = �%s�\n"
 "Du b�r endre dem med kommandoen --change-pin\n"
 
-#: g10/card-util.c:1115
+#: g10/card-util.c:1118
 msgid "Please select the type of key to generate:\n"
 msgstr "Vennligst velg hvilken type n�kkel du vil generere:\n"
 
-#: g10/card-util.c:1117 g10/card-util.c:1194
+#: g10/card-util.c:1120 g10/card-util.c:1197
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signaturn�kkel\n"
 
-#: g10/card-util.c:1118 g10/card-util.c:1196
+#: g10/card-util.c:1121 g10/card-util.c:1199
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsn�kkel\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1198
+#: g10/card-util.c:1122 g10/card-util.c:1201
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsn�kkel\n"
 
-#: g10/card-util.c:1135 g10/card-util.c:1214 g10/keyedit.c:945
+#: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
 #: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ugyldig valg.\n"
 
-#: g10/card-util.c:1191
+#: g10/card-util.c:1194
 msgid "Please select where to store the key:\n"
 msgstr "Vennligst velg hvor n�kkelen skal lagres:\n"
 
-#: g10/card-util.c:1226
+#: g10/card-util.c:1229
 msgid "unknown key protection algorithm\n"
 msgstr "ukjent n�kkelbeskyttelsesalgoritme\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1234
 msgid "secret parts of key are not available\n"
 msgstr "hemmelige deler av n�kkelen er ikke tilgjengelig.\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1239
 msgid "secret key already stored on a card\n"
 msgstr "hemmelig n�kkel er allerede lagret p� et kort\n"
 
-#: g10/card-util.c:1304 g10/keyedit.c:1362
+#: g10/card-util.c:1307 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "avslutte denne menyen"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1309
 msgid "show admin commands"
 msgstr "vise admin-kommandoer"
 
-#: g10/card-util.c:1307 g10/keyedit.c:1365
+#: g10/card-util.c:1310 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "vise denne hjelpen"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1312
 msgid "list all available data"
 msgstr "vis alle tilgjengelige data"
 
-#: g10/card-util.c:1312
+#: g10/card-util.c:1315
 msgid "change card holder's name"
 msgstr "endre kortholders navn"
 
-#: g10/card-util.c:1313
+#: g10/card-util.c:1316
 msgid "change URL to retrieve key"
 msgstr "endre URL for � hente n�kkel"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1317
 msgid "fetch the key specified in the card URL"
 msgstr "hente n�kkelen angitt i URL som er lagret i kortet"
 
-#: g10/card-util.c:1315
+#: g10/card-util.c:1318
 msgid "change the login name"
 msgstr "endre loginnavnet"
 
-#: g10/card-util.c:1316
+#: g10/card-util.c:1319
 msgid "change the language preferences"
 msgstr "endre spr�kpreferansene"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1320
 msgid "change card holder's sex"
 msgstr "endre kortholders kj�nn"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1321
 msgid "change a CA fingerprint"
 msgstr "vise et CA-fingeravtrykk"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1322
 msgid "toggle the signature force PIN flag"
 msgstr "veksle tving-signatur-PIN-flagget"
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1323
 msgid "generate new keys"
 msgstr "generere nye n�kler"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1324
 msgid "menu to change or unblock the PIN"
 msgstr "meny for � endre eller fjerne blokkering av PIN"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1325
 msgid "verify the PIN and list all data"
 msgstr "bekrefte PIN og vise alle data"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1634
+#: g10/card-util.c:1445 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/card-util.c:1480
+#: g10/card-util.c:1483
 msgid "Admin-only command\n"
 msgstr "Admin-reservert kommando\n"
 
-#: g10/card-util.c:1511
+#: g10/card-util.c:1514
 msgid "Admin commands are allowed\n"
 msgstr "Admin-kommandoer er tillatt\n"
 
-#: g10/card-util.c:1513
+#: g10/card-util.c:1516
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-kommandoer er ikke tillatt\n"
 
-#: g10/card-util.c:1587 g10/keyedit.c:2255
+#: g10/card-util.c:1590 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ugyldig kommando  (pr�v �help�)\n"
 
@@ -1138,7 +1149,7 @@ msgstr "Ugyldig kommando  (pr�v �help�)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output virker ikke for denne kommandoen\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �pne �%s�\n"
@@ -1437,7 +1448,7 @@ msgstr "bruker undern�kkel %s i stedet for prim�rn�kkel %s\n"
 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/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1453,27 +1464,27 @@ msgstr "|[fil]|lage en signatur"
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|lage en klartekstsignatur"
 
-#: g10/gpg.c:372 sm/gpgsm.c:244
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "lage en adskilt signatur"
 
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "kryptere data"
 
-#: g10/gpg.c:375 sm/gpgsm.c:246
+#: g10/gpg.c:375 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "kryptering med bare symmetrisk cipher"
 
-#: g10/gpg.c:377 sm/gpgsm.c:247
+#: g10/gpg.c:377 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "dekryptere data (standard)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:248
+#: g10/gpg.c:379 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "bekrefte en signatur"
 
-#: g10/gpg.c:381 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "liste n�kler"
 
@@ -1485,11 +1496,11 @@ msgstr "liste n�kler og signaturer"
 msgid "list and check key signatures"
 msgstr "vise og sjekke n�kkelsignaturer"
 
-#: g10/gpg.c:385 sm/gpgsm.c:254
+#: g10/gpg.c:385 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "liste n�kler og fingeravtrykk"
 
-#: g10/gpg.c:386 sm/gpgsm.c:252
+#: g10/gpg.c:386 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "liste hemmelige n�kler"
 
@@ -1525,11 +1536,11 @@ msgstr "generere et opphevingssertifikat"
 msgid "export keys"
 msgstr "eksportere n�kler"
 
-#: g10/gpg.c:397 sm/gpgsm.c:257
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "eksportere n�kler til en n�kkelserver"
 
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "importere n�kler fra en n�kkelserver"
 
@@ -1565,11 +1576,11 @@ msgstr "oppdatere tillitsdatabasen"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skrive meldingsdigester"
 
-#: g10/gpg.c:430 sm/gpgsm.c:262
+#: g10/gpg.c:430 sm/gpgsm.c:264
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
 #: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1580,31 +1591,31 @@ msgstr ""
 "Valg:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:279
+#: g10/gpg.c:434 sm/gpgsm.c:281
 msgid "create ascii armored output"
 msgstr "lage ASCII-beskyttet output"
 
-#: g10/gpg.c:436 sm/gpgsm.c:291
+#: g10/gpg.c:436 sm/gpgsm.c:293
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAVN|kryptere for NAVN"
 
-#: g10/gpg.c:447 sm/gpgsm.c:327
+#: g10/gpg.c:447 sm/gpgsm.c:331
 msgid "use this user-id to sign or decrypt"
 msgstr "bruke denne brukeriden for signering eller dekryptering"
 
-#: g10/gpg.c:448 sm/gpgsm.c:330
+#: g10/gpg.c:448 sm/gpgsm.c:334
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sette kompresjonsniv� til N (0 sl�r av kompresjon)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:332
+#: g10/gpg.c:453 sm/gpgsm.c:336
 msgid "use canonical text mode"
 msgstr "bruk kanonisk tekstmodus"
 
-#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "bruk som outputfil"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "ikke gj�r noen endringer"
 
@@ -1620,7 +1631,7 @@ msgstr "bruk streng OpenPGP-oppf�rsel"
 msgid "generate PGP 2.x compatible messages"
 msgstr "generere PGP 2.x-kompatible meldinger"
 
-#: g10/gpg.c:553 sm/gpgsm.c:393
+#: g10/gpg.c:553 sm/gpgsm.c:397
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1628,7 +1639,7 @@ msgstr ""
 "@\n"
 "(Se mansiden for en komplett liste over alle kommandoene og valgene)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:396
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1666,7 +1677,7 @@ msgstr ""
 "signere, sjekke, kryptere eller dekryptere\n"
 "standard operasjon avhenger av inputdata\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:532
+#: g10/gpg.c:781 sm/gpgsm.c:538
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1694,7 +1705,7 @@ msgstr "Kompresjon: "
 msgid "usage: gpg [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:669
+#: g10/gpg.c:1045 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "motstridende kommandoer\n"
 
@@ -1780,445 +1791,445 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "ukjent konfigurasjonspunkt �%s�\n"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1544
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1552
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1560
 msgid "show the keyring name in key listings"
 msgstr "vise navnet til n�kkelknippene i n�kkellister"
 
-#: g10/gpg.c:1564
+#: g10/gpg.c:1562
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1827
+#: g10/gpg.c:1825
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1981
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "MERK: den gamle valgfila �%s� ble ignorert\n"
 
-#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
+#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MERK: %s er ikke for vanlig bruk!\n"
 
 # Tenk litt p� denne du, Trond.
-#: g10/gpg.c:2401 g10/gpg.c:2413
+#: g10/gpg.c:2399 g10/gpg.c:2411
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�%s� er ikke en gyldig signaturutg�else\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2493
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�%s� er ikke et gyldig tegnsett\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4084
+#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "kunne ikke parse n�kkelserverens URL\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2528
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2531
 msgid "invalid keyserver options\n"
 msgstr "ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2538
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importvalg\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2541
 msgid "invalid import options\n"
 msgstr "ugyldige importvalg\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2548
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2551
 msgid "invalid export options\n"
 msgstr "ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2558
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listevalg\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2561
 msgid "invalid list options\n"
 msgstr "ugyldige listevalg\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2569
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2571
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2573
 msgid "show all notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2575
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2579
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2581
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2583
 msgid "show user ID validity during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2585
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2587
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2589
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2591
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2598
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2601
 msgid "invalid verify options\n"
 msgstr "ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2608
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunne ikke sette exec-path til %s\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2782
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig auto-key-locate-liste\n"
 
-#: g10/gpg.c:2787
+#: g10/gpg.c:2785
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2873 sm/gpgsm.c:1220
+#: g10/gpg.c:2871 sm/gpgsm.c:1247
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: programmet kan opprette en corefil!\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2875
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overstyrere %s\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2884
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s er ikke tillatt sammen med %s!\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2887
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er ikke fornuftig med %s!\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2902
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2918
+#: g10/gpg.c:2916
 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:2924
+#: g10/gpg.c:2922
 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:2930
+#: g10/gpg.c:2928
 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:2943
+#: g10/gpg.c:2941
 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:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
+#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1303
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt krypteringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
+#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1311
 msgid "selected digest algorithm is invalid\n"
 msgstr "valg digestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt kompresjonsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3025
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt sertifikasjondigestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3040
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m� v�re st�rre enn 0\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3042
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-neede m� v�re st�rre enn 1\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3044
 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:3048
+#: g10/gpg.c:3046
 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:3050
+#: g10/gpg.c:3048
 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:3053
+#: g10/gpg.c:3051
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MERK: enkel S2K-modus (0) er sterkt frar�det\n"
 
-#: g10/gpg.c:3057
+#: g10/gpg.c:3055
 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:3064
+#: g10/gpg.c:3062
 msgid "invalid default preferences\n"
 msgstr "ugyldig standard preferanser\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3071
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldig personlig cipherpreferanser\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3075
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldig personlig digestpreferanser\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3079
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldig personlig kompresjonspreferanser\n"
 
-#: g10/gpg.c:3114
+#: g10/gpg.c:3112
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker ikke enn� med %s\n"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3159
 #, 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:3166
+#: g10/gpg.c:3164
 #, 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:3171
+#: g10/gpg.c:3169
 #, 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:3263
+#: g10/gpg.c:3261
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "klarte ikke � initialisere tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3272
 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:3295
+#: g10/gpg.c:3293
 msgid "--store [filename]"
 msgstr "--store [filnavn]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3300
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3302
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av �%s� mislyktes: %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3312
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3325
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnavn]"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3327
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3332
+#: g10/gpg.c:3330
 #, 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:3350
+#: g10/gpg.c:3348
 msgid "--sign [filename]"
 msgstr "--sign [filnavn]"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3361
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3376
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3378
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3381
 #, 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:3403
+#: g10/gpg.c:3401
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnavn]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3410
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3435
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn]"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3443
 msgid "--sign-key user-id"
 msgstr "--sign-key brukerid"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3447
 msgid "--lsign-key user-id"
 msgstr "--lsign-key brukerid"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3468
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key brukerid [kommandoer]"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3553
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sending til n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "mottak fra n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3557
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "n�kkeleksport mislyktes: %s\n"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3568
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "s�k p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3580
+#: g10/gpg.c:3578
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3631
+#: g10/gpg.c:3629
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:3639
+#: g10/gpg.c:3637
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:3729
+#: g10/gpg.c:3727
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hashalgoritme �%s�\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3844
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3850
+#: g10/gpg.c:3848
 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:4160
 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:4162
 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:4195
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angitte URLen for den foretrukkede n�kkelserveren er ugyldig\n"
 
@@ -2230,7 +2241,7 @@ msgstr "hent n�klene fra dette n�kkelknippet"
 msgid "make timestamp conflicts only a warning"
 msgstr "la konflikter mellom tidsstempler bare v�re en advarsel"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:368
+#: g10/gpgv.c:75 sm/gpgsm.c:372
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skrive statusinfo til denne FD"
 
@@ -6426,61 +6437,61 @@ msgstr "bekrefting av Admin PIN er forel�pig nektet gjennom denne kommandoen\n"
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan ikke aksere %s - ugyldig OpenPGP-kort?\n"
 
-#: scd/scdaemon.c:105
+#: scd/scdaemon.c:108
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:357
+#: scd/scdaemon.c:114 sm/gpgsm.c:361
 #, fuzzy
 msgid "read options from file"
 msgstr "leser valg fra �%s�\n"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:124
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:126
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:129
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:134
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:135
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "vise admin-kommandoer"
 
-#: scd/scdaemon.c:206
+#: scd/scdaemon.c:209
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: scd/scdaemon.c:208
+#: scd/scdaemon.c:211
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:671
+#: scd/scdaemon.c:658
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1019
+#: scd/scdaemon.c:1006
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1024
+#: scd/scdaemon.c:1011
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6508,142 +6519,256 @@ msgstr ""
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:174
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr ""
+
+#: sm/certchain.c:195
+msgid "chain"
+msgstr ""
+
+#: sm/certchain.c:196
+msgid "shell"
+msgstr ""
+
+#: sm/certchain.c:241
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr ""
 
-#: sm/certchain.c:212
+#: sm/certchain.c:279
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:250
+#: sm/certchain.c:317
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:260
+#: sm/certchain.c:327
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "Kan ikke �pne �%s�: %s\n"
 
-#: sm/certchain.c:267 sm/certchain.c:296
+#: sm/certchain.c:334 sm/certchain.c:363
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:271 sm/certchain.c:300
+#: sm/certchain.c:338 sm/certchain.c:367
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "eksportering av hemmelige n�kler er ikke tillatt\n"
 
-#: sm/certchain.c:411
+#: sm/certchain.c:478
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:431
+#: sm/certchain.c:498
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "klarte ikke � lagre n�kkelen: %s\n"
 
-#: sm/certchain.c:675
+#: sm/certchain.c:742
 msgid "certificate has been revoked"
 msgstr ""
 
-#: sm/certchain.c:684
+#: sm/certchain.c:752
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "ugyldig sertifikat"
 
-#: sm/certchain.c:688
+#: sm/certchain.c:757
+msgid "the status of the certificate is unknown"
+msgstr ""
+
+#: sm/certchain.c:762
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "N�kkel tilgjengelig ved: "
 
-#: sm/certchain.c:690
+#: sm/certchain.c:764
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:695
+#: sm/certchain.c:770
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "sleting av n�kkelblokk mislyktes: %s\n"
 
-#: sm/certchain.c:791
-#, fuzzy
-msgid "no issuer found in certificate"
-msgstr "generere et opphevingssertifikat"
-
-#: sm/certchain.c:820
+#: sm/certchain.c:799 sm/certchain.c:867
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:836
+#: sm/certchain.c:814 sm/certchain.c:899
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:849
+#: sm/certchain.c:815 sm/certchain.c:900
+#, fuzzy
+msgid "root certificate not yet valid"
+msgstr "eksportering av hemmelige n�kler er ikke tillatt\n"
+
+#: sm/certchain.c:816 sm/certchain.c:901
+msgid "intermediate certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:829
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Denne n�kkelen er utg�tt!"
 
-#: sm/certchain.c:892
-msgid "self-signed certificate has a BAD signature"
+#: sm/certchain.c:830
+#, fuzzy
+msgid "root certificate has expired"
+msgstr "Denne n�kkelen er utg�tt!"
+
+#: sm/certchain.c:831
+#, fuzzy
+msgid "intermediate certificate has expired"
+msgstr "Denne n�kkelen er utg�tt!"
+
+#: sm/certchain.c:873
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:960
-msgid "root certificate is not marked trusted"
+#: sm/certchain.c:882
+#, fuzzy
+msgid "certificate with invalid validity"
+msgstr "Denne n�kkelen er utg�tt!"
+
+#: sm/certchain.c:919
+msgid "signature not created during lifetime of certificate"
+msgstr ""
+
+#: sm/certchain.c:921
+msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:975
+#: sm/certchain.c:922
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:926
+#, fuzzy
+msgid "  (  signature created at "
+msgstr "         oppryddete signaturer: %lu\n"
+
+#: sm/certchain.c:927
+#, fuzzy
+msgid "  (certificate created at "
+msgstr "preferansen %s er duplisert\n"
+
+#: sm/certchain.c:930
+#, fuzzy
+msgid "  (certificate valid from "
+msgstr "ugyldig sertifikat"
+
+#: sm/certchain.c:931
+#, fuzzy
+msgid "  (     issuer valid from "
+msgstr "      Serienummer for kort ="
+
+#: sm/certchain.c:961
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "CA-fingeravtrykk: "
 
-#: sm/certchain.c:983
+#: sm/certchain.c:970
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:998
+#: sm/certchain.c:983
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1004
+#: sm/certchain.c:989
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1046
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr ""
+
+#: sm/certchain.c:1110
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "generere et opphevingssertifikat"
+
+#: sm/certchain.c:1184
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:1253
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:1266
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
 
-#: sm/certchain.c:1041 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1053
+#: sm/certchain.c:1307
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1086
+#: sm/certchain.c:1340
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "bekrefte en signatur"
 
-#: sm/certchain.c:1116
+#: sm/certchain.c:1371
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1167
+#: sm/certchain.c:1422
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
+#: sm/certchain.c:1462 sm/certchain.c:1730
+#, fuzzy
+msgid "certificate is good\n"
+msgstr "preferansen %s er duplisert\n"
+
+#: sm/certchain.c:1463
+#, fuzzy
+msgid "intermediate certificate is good\n"
+msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
+
+#: sm/certchain.c:1464
+#, fuzzy
+msgid "root certificate is good\n"
+msgstr "ugyldig sertifikat"
+
+#: sm/certchain.c:1620
+msgid "switching to chain model"
+msgstr ""
+
+#: sm/certchain.c:1629
+#, c-format
+msgid "validation model used: %s"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "chain model"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "shell model"
+msgstr ""
+
 #: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
@@ -6691,7 +6816,7 @@ msgstr "Feil: ugyldig respons.\n"
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
 "\"%s\"\n"
-"S/N %s, ID %08lX, created %s"
+"S/N %s, ID 0x%08lX, created %s"
 msgstr ""
 "Du trenger en passfrase for � l�se opp den hemmelige n�kkelen for brukeren:\n"
 "�%.*s�\n"
@@ -6701,7 +6826,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:131 sm/keylist.c:255
+#: sm/certlist.c:131 sm/keylist.c:258
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
@@ -6823,189 +6948,189 @@ msgstr "feil ved opprettelse av passfrase: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
 
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[fil]|lage en signatur"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[fil]|lage en klartekstsignatur"
 
-#: sm/gpgsm.c:251
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list external keys"
 msgstr "liste hemmelige n�kler"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list certificate chain"
 msgstr "ugyldig sertifikat"
 
-#: sm/gpgsm.c:256
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "fjerne n�kler fra det offentlige n�kkelknippet"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "import certificates"
 msgstr "ugyldig sertifikat"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:262
 #, fuzzy
 msgid "export certificates"
 msgstr "ugyldig sertifikat"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:268
 #, fuzzy
 msgid "change a passphrase"
 msgstr "endre passfrasen"
 
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "lage ASCII-beskyttet output"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:287
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:296
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:302
+#: sm/gpgsm.c:304
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:305
+#: sm/gpgsm.c:309
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:312
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:315
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:319
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:323
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:325
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "hoppet over: offentlig n�kkel allerede satt som standard mottaker\n"
 
-#: sm/gpgsm.c:338
+#: sm/gpgsm.c:342
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:346
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "sjekke signaturer"
 
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:347
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:352
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:353
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:354
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:356
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "hent n�klene fra dette n�kkelknippet"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:357
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "Trenger den hemmelige n�kkelen for � gj�re dette.\n"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:359
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:360
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAVN|kryptere for NAVN"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:364
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:375
+#: sm/gpgsm.c:379
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:381
+#: sm/gpgsm.c:385
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "ukjent kryptoalgoritme"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:387
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s signatur, digestalgoritme %s\n"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:389
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "ukjent kompresjonsalgoritme"
 
-#: sm/gpgsm.c:522
+#: sm/gpgsm.c:528
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: sm/gpgsm.c:525
+#: sm/gpgsm.c:531
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7016,31 +7141,36 @@ msgstr ""
 "signere, sjekke, kryptere eller dekryptere\n"
 "standard operasjon avhenger av inputdata\n"
 
-#: sm/gpgsm.c:604
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: sm/gpgsm.c:685
+#: sm/gpgsm.c:691
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: sm/gpgsm.c:1237
+#: sm/gpgsm.c:713
+#, fuzzy, c-format
+msgid "unknown validation model `%s'\n"
+msgstr "ukjent valg �%s�\n"
+
+#: sm/gpgsm.c:1264
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1316
+#: sm/gpgsm.c:1344
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1334
+#: sm/gpgsm.c:1362
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan ikke aksere �%s�: %s\n"
 
-#: sm/gpgsm.c:1529
+#: sm/gpgsm.c:1543
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7063,7 +7193,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:375
+#: sm/import.c:541 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
@@ -7147,7 +7277,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234
+#: sm/qualified.c:234 sm/verify.c:536
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7166,30 +7296,35 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr ""
 
-#: sm/verify.c:386
+#: sm/verify.c:388
 #, fuzzy
 msgid "Signature made "
 msgstr "Signatur opprettet %s\n"
 
-#: sm/verify.c:390
+#: sm/verify.c:392
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:391
-#, c-format
-msgid " using certificate ID %08lX\n"
-msgstr ""
+#: sm/verify.c:393
+#, fuzzy, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
 
-#: sm/verify.c:507
+#: sm/verify.c:514
 #, fuzzy
 msgid "Good signature from"
 msgstr "God signatur fra �%s�"
 
-#: sm/verify.c:508
+#: sm/verify.c:515
 #, fuzzy
 msgid "                aka"
 msgstr "                aka �%s�"
 
+#: sm/verify.c:533
+#, fuzzy
+msgid "This is a qualified signature\n"
+msgstr "Dette vil v�re en selvsignatur.\n"
+
 #: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
@@ -7226,131 +7361,136 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:315
+#: tools/gpg-connect-agent.c:314
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:323
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:382
+#: tools/gpg-connect-agent.c:381
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "for lang linje"
 
-#: tools/gpg-connect-agent.c:386
+#: tools/gpg-connect-agent.c:385
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:458
+#: tools/gpg-connect-agent.c:457
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "ukjent valg �%s�\n"
 
-#: tools/gpg-connect-agent.c:466
+#: tools/gpg-connect-agent.c:465
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "signering mislyktes: %s\n"
 
-#: tools/gpg-connect-agent.c:474
+#: tools/gpg-connect-agent.c:473
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
 
-#: tools/gpg-connect-agent.c:784
+#: tools/gpg-connect-agent.c:789
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: tools/gpg-connect-agent.c:793
+#: tools/gpg-connect-agent.c:798
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
+#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
-#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
+#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
-#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:501
+#: tools/gpgconf-comp.c:492
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:505
+#: tools/gpgconf-comp.c:496
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:509
+#: tools/gpgconf-comp.c:500
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:510
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:638
+#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#, fuzzy
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAVN|kryptere for NAVN"
+
+#: tools/gpgconf-comp.c:635
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:640
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:685
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:705
+#: tools/gpgconf-comp.c:708
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:749
+#: tools/gpgconf-comp.c:752
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:785
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:806
+#: tools/gpgconf-comp.c:809
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:814
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:848
+#: tools/gpgconf-comp.c:851
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2681
+#: tools/gpgconf-comp.c:2684
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 83f891c13..f3ce7d8fc 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-07-05 18:01+0200\n"
+"POT-Creation-Date: 2007-08-10 15:49+0200\n"
 "PO-Revision-Date: 2004-06-23 15:54+0200\n"
 "Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -29,54 +29,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: agent/call-pinentry.c:426
+#: agent/call-pinentry.c:436
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:429
+#: agent/call-pinentry.c:439
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
 
-#: agent/call-pinentry.c:476
+#: agent/call-pinentry.c:486
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
+#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
 #, fuzzy
 msgid "PIN too long"
 msgstr "linia zbyt d�uga\n"
 
-#: agent/call-pinentry.c:497
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "has�o zbyt d�ugie\n"
 
-#: agent/call-pinentry.c:505
+#: agent/call-pinentry.c:515
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:520
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:522
+#: agent/call-pinentry.c:532
 #, fuzzy
 msgid "Bad PIN"
 msgstr "b��d MPI"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:533
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "niepoprawne has�o"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:569
 #, fuzzy
 msgid "Passphrase"
 msgstr "niepoprawne has�o"
@@ -93,14 +93,14 @@ msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
 msgid "can't create `%s': %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
 #: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
-#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1796
+#: sm/gpgsm.c:1833 sm/gpgsm.c:1871 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
@@ -188,34 +188,45 @@ msgstr[1] ""
 msgid "Take this one anyway"
 msgstr "U�y� tego klucza pomimo to? "
 
-#: agent/genkey.c:99
+#: agent/genkey.c:99 agent/genkey.c:114
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Has�o\n"
 
-#: agent/genkey.c:144
+#: agent/genkey.c:107
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+
+#: agent/genkey.c:113
+msgid "Yes, protection is not needed"
+msgstr ""
+
+#: agent/genkey.c:158
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Musisz poda� d�ugie, skomplikowane has�o aby ochroni� sw�j klucz tajny.\n"
 
-#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
+#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "zmiana has�a klucza"
 
-#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
 #: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:263
+#: agent/genkey.c:280
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "zmiana has�a klucza"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -225,248 +236,248 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:103
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
-#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
 #: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "z dodatkowymi informacjami"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
-#: sm/gpgsm.c:337
+#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "mniej komunikat�ww"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:109
+#: agent/gpg-agent.c:118 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:119
+#: agent/gpg-agent.c:125 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:125
+#: agent/gpg-agent.c:126
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "szukanie kluczy na serwerze"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:129
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "uaktualnienie bazy zaufania"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:145
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:206 sm/gpgsm.c:525 tools/gpg-connect-agent.c:124
 #: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "B��dy prosimy zg�asza� na adres <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:262
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
+#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
-#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:340 sm/gpgsm.c:772 sm/gpgsm.c:775 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
+#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:863
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
 
-#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
-#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: scd/scdaemon.c:421 sm/gpgsm.c:867 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
+#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:874
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "b��d tworzenia `%s': %s\n"
 
-#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
-#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:921
+#: agent/gpg-agent.c:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
+#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:908
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nie mo�na utworzy� katalogu ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
+#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
 
-#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
+#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "b��d przy wysy�aniu do ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
+#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
+#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: katalog utworzony\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1377
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "baza zaufania: funkcja read() (n=%d) zawiod�a: %s\n"
 
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1381
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: nie mo�na utworzy� katalogu: %s\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1497
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1519
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
+#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "zapis zmian na kluczu prywatnym nie powi�d� si�: %s\n"
 
-#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
+#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu kluczy pomini�tych\n"
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1752
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
 
-#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:751
+#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "z�y format zmiennej �rodowiskowej GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
-#: tools/gpg-connect-agent.c:762
+#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "wersja %d protoko�u agenta nie jest obs�ugiwana\n"
@@ -531,42 +542,42 @@ msgstr "b��d podczas tworzenia has�a: %s\n"
 msgid "cancelled\n"
 msgstr "Anuluj"
 
-#: agent/trustlist.c:131 agent/trustlist.c:319
+#: agent/trustlist.c:132 agent/trustlist.c:322
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: agent/trustlist.c:146
+#: agent/trustlist.c:147
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: agent/trustlist.c:166 agent/trustlist.c:174
+#: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:180
+#: agent/trustlist.c:181
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "tajne cz�ci klucza s� niedost�pne\n"
 
-#: agent/trustlist.c:215
+#: agent/trustlist.c:216
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "b��d odczytu: %s\n"
 
-#: agent/trustlist.c:241 agent/trustlist.c:248
+#: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:280
+#: agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: agent/trustlist.c:381 agent/trustlist.c:420
+#: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -579,7 +590,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:496
+#: agent/trustlist.c:507
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -589,7 +600,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:505
+#: agent/trustlist.c:516
 msgid "Correct"
 msgstr ""
 
@@ -601,58 +612,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:525
+#: agent/trustlist.c:536
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 #, fuzzy
 msgid "Yes"
 msgstr "tak"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:393
+#: common/exechelp.c:302 common/exechelp.c:390
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: common/exechelp.c:369 common/exechelp.c:426
+#: common/exechelp.c:366 common/exechelp.c:423
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "nie mo�na otworzy� pliku: %s\n"
 
-#: common/exechelp.c:405 common/exechelp.c:635
+#: common/exechelp.c:402 common/exechelp.c:632
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: common/exechelp.c:461 common/exechelp.c:504
+#: common/exechelp.c:458 common/exechelp.c:501
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:469
+#: common/exechelp.c:466
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: common/exechelp.c:475 common/exechelp.c:515
+#: common/exechelp.c:472 common/exechelp.c:512
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: common/exechelp.c:510
+#: common/exechelp.c:507
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:521
+#: common/exechelp.c:518
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
@@ -671,26 +682,26 @@ msgstr "%s: nie znaleziono u�ytkownika\n"
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
 
-#: common/simple-pwquery.c:376
+#: common/simple-pwquery.c:373
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
 
-#: common/simple-pwquery.c:387
+#: common/simple-pwquery.c:384
 msgid "communication problem with gpg-agent\n"
 msgstr "problem z porozumiewaniem si� z agentem\n"
 
-#: common/simple-pwquery.c:397
+#: common/simple-pwquery.c:394
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "problem agenta: zwr�ci� 0x%lx\n"
 
-#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+#: common/simple-pwquery.c:557 common/simple-pwquery.c:653
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "anulowano przez u�ytkownika\n"
 
-#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+#: common/simple-pwquery.c:572 common/simple-pwquery.c:659
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problem agenta: zwr�ci� 0x%lx\n"
@@ -872,7 +883,7 @@ msgstr "OSTRZE�ENIE: niepoprawne dane w adnotacji\n"
 msgid "not human readable"
 msgstr "nieczytelne dla cz�owieka"
 
-#: g10/card-util.c:62 g10/card-util.c:305
+#: g10/card-util.c:62 g10/card-util.c:308
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "brak klucza prywatnego"
@@ -882,168 +893,168 @@ msgstr "brak klucza prywatnego"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1391 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "nie dzia�a w trybie wsadowym\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
 #: g10/keygen.c:1644
 msgid "Your selection? "
 msgstr "Tw�j wyb�r? "
 
-#: g10/card-util.c:215 g10/card-util.c:265
+#: g10/card-util.c:218 g10/card-util.c:268
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:412
+#: g10/card-util.c:415
 #, fuzzy
 msgid "male"
 msgstr "w�kl"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 #, fuzzy
 msgid "female"
 msgstr "w�kl"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 #, fuzzy
 msgid "unspecified"
 msgstr "nie podano przyczyny"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 #, fuzzy
 msgid "not forced"
 msgstr "nie zosta� przetworzony"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:521
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:523
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:525
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:539
+#: g10/card-util.c:542
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:544
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:562
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:580
+#: g10/card-util.c:583
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "brak odpowiadaj�cego klucza publicznego: %s\n"
 
-#: g10/card-util.c:588
+#: g10/card-util.c:591
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
+#: g10/card-util.c:689 g10/card-util.c:758 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: g10/card-util.c:694
+#: g10/card-util.c:697
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:704
+#: g10/card-util.c:707
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:763
+#: g10/card-util.c:766
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:773
+#: g10/card-util.c:776
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:793
+#: g10/card-util.c:796
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualizacja ustawie� klucza"
 
-#: g10/card-util.c:801
+#: g10/card-util.c:804
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "niew�a�ciwy znak w tek�cie ustawie�\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:813
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "niew�a�ciwy znak w tek�cie ustawie�\n"
 
-#: g10/card-util.c:831
+#: g10/card-util.c:834
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:845
+#: g10/card-util.c:848
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 
-#: g10/card-util.c:866
+#: g10/card-util.c:869
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Odcisk klucza:"
 
-#: g10/card-util.c:889
+#: g10/card-util.c:892
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 
-#: g10/card-util.c:937
+#: g10/card-util.c:940
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:941
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/card-util.c:947
+#: g10/card-util.c:950
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: g10/card-util.c:1031
+#: g10/card-util.c:1034
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/card-util.c:1051 g10/card-util.c:1060
+#: g10/card-util.c:1054 g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1075
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1084
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1051,136 +1062,136 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1115
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Prosz� wybra� rodzaj klucza:\n"
 
-#: g10/card-util.c:1117 g10/card-util.c:1194
+#: g10/card-util.c:1120 g10/card-util.c:1197
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/card-util.c:1118 g10/card-util.c:1196
+#: g10/card-util.c:1121 g10/card-util.c:1199
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1198
+#: g10/card-util.c:1122 g10/card-util.c:1201
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1135 g10/card-util.c:1214 g10/keyedit.c:945
+#: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
 #: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Niew�a�ciwy wyb�r.\n"
 
-#: g10/card-util.c:1191
+#: g10/card-util.c:1194
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Prosz� wybra� pow�d uniewa�nienia:\n"
 
-#: g10/card-util.c:1226
+#: g10/card-util.c:1229
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nieznany algorytm ochrony\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1234
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1239
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/card-util.c:1304 g10/keyedit.c:1362
+#: g10/card-util.c:1307 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "wyj�cie z tego menu"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1309
 #, fuzzy
 msgid "show admin commands"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1307 g10/keyedit.c:1365
+#: g10/card-util.c:1310 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1312
 #, fuzzy
 msgid "list all available data"
 msgstr "Klucz dost�pny w: "
 
-#: g10/card-util.c:1312
+#: g10/card-util.c:1315
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1313
+#: g10/card-util.c:1316
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1317
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1315
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "change the login name"
 msgstr "zmiana daty wa�no�ci klucza"
 
-#: g10/card-util.c:1316
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "change the language preferences"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1320
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1322
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1323
 #, fuzzy
 msgid "generate new keys"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1324
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1325
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442 g10/keyedit.c:1634
+#: g10/card-util.c:1445 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Polecenie> "
 
-#: g10/card-util.c:1480
+#: g10/card-util.c:1483
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1511
+#: g10/card-util.c:1514
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1513
+#: g10/card-util.c:1516
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/card-util.c:1587 g10/keyedit.c:2255
+#: g10/card-util.c:1590 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
 
@@ -1188,7 +1199,7 @@ msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "opcja --output nie dzia�a z tym poleceniem\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo�na otworzy� ,,%s''\n"
@@ -1494,7 +1505,7 @@ msgstr "u�ywany jest podklucz %08lX zamiast klucza g��wnego %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pomini�ty\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1510,27 +1521,27 @@ msgstr "|[plik]|z�o�enie podpisu"
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu pod dokumentem"
 
-#: g10/gpg.c:372 sm/gpgsm.c:244
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "z�o�enie podpisu oddzielonego od dokumentu"
 
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/gpg.c:375 sm/gpgsm.c:246
+#: g10/gpg.c:375 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/gpg.c:377 sm/gpgsm.c:247
+#: g10/gpg.c:377 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lne)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:248
+#: g10/gpg.c:379 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/gpg.c:381 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "lista kluczy"
 
@@ -1543,11 +1554,11 @@ msgstr "lista kluczy i podpis�w"
 msgid "list and check key signatures"
 msgstr "sprawdzenie podpis�w kluczy"
 
-#: g10/gpg.c:385 sm/gpgsm.c:254
+#: g10/gpg.c:385 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/gpg.c:386 sm/gpgsm.c:252
+#: g10/gpg.c:386 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "lista kluczy prywatnych"
 
@@ -1583,11 +1594,11 @@ msgstr "tworzenie certyfikatu uniewa�nienia klucza"
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/gpg.c:397 sm/gpgsm.c:257
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
@@ -1623,11 +1634,11 @@ msgstr "uaktualnienie bazy zaufania"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/gpg.c:430 sm/gpgsm.c:262
+#: g10/gpg.c:430 sm/gpgsm.c:264
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
 #: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1638,31 +1649,31 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:279
+#: g10/gpg.c:434 sm/gpgsm.c:281
 msgid "create ascii armored output"
 msgstr "opakowanie ASCII pliku wynikowego"
 
-#: g10/gpg.c:436 sm/gpgsm.c:291
+#: g10/gpg.c:436 sm/gpgsm.c:293
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/gpg.c:447 sm/gpgsm.c:327
+#: g10/gpg.c:447 sm/gpgsm.c:331
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/gpg.c:448 sm/gpgsm.c:330
+#: g10/gpg.c:448 sm/gpgsm.c:334
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - bez)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:332
+#: g10/gpg.c:453 sm/gpgsm.c:336
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
@@ -1678,7 +1689,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:393
+#: g10/gpg.c:553 sm/gpgsm.c:397
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1686,7 +1697,7 @@ msgstr ""
 "@\n"
 "(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:396
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1725,7 +1736,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:532
+#: g10/gpg.c:781 sm/gpgsm.c:538
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1753,7 +1764,7 @@ msgstr "Kompresji: "
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/gpg.c:1045 sm/gpgsm.c:669
+#: g10/gpg.c:1045 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
@@ -1841,463 +1852,463 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "nieznana opcja ,,%s''\n"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: 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:1548
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1554
+#: 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:1556
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1562
+#: 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:1564
+#: 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:1827
+#: g10/gpg.c:1825
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1981
 #, 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:2243 g10/gpg.c:2884 g10/gpg.c:2896
+#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/gpg.c:2401 g10/gpg.c:2413
+#: g10/gpg.c:2399 g10/gpg.c:2411
 #, 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:2495
+#: g10/gpg.c:2493
 #, 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:2518 g10/gpg.c:2713 g10/keyedit.c:4084
+#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2528
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2531
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2538
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2541
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2548
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2551
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2558
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2561
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2569
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2571
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2573
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2575
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2579
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2581
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2585
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2587
 #, 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
+#: g10/gpg.c:2589
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2591
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2598
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2608
 #, 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:2784
+#: g10/gpg.c:2782
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2787
+#: g10/gpg.c:2785
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2873 sm/gpgsm.c:1220
+#: g10/gpg.c:2871 sm/gpgsm.c:1247
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2875
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2884
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2887
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w po��czeniu z %s!\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2902
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/gpg.c:2918
+#: g10/gpg.c:2916
 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:2924
+#: g10/gpg.c:2922
 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:2930
+#: g10/gpg.c:2928
 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:2943
+#: g10/gpg.c:2941
 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:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
+#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1303
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
+#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1311
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3025
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3040
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3042
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3044
 #, 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:3048
+#: g10/gpg.c:3046
 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:3050
+#: g10/gpg.c:3048
 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:3053
+#: g10/gpg.c:3051
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/gpg.c:3057
+#: g10/gpg.c:3055
 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:3064
+#: g10/gpg.c:3062
 msgid "invalid default preferences\n"
 msgstr "niew�a�ciwe domy�lne ustawienia\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3071
 msgid "invalid personal cipher preferences\n"
 msgstr "niew�a�ciwe ustawienia szyfr�w\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3075
 msgid "invalid personal digest preferences\n"
 msgstr "niew�a�ciwe ustawienia skr�t�w\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3079
 msgid "invalid personal compress preferences\n"
 msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
 
-#: g10/gpg.c:3114
+#: g10/gpg.c:3112
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie dzia�a z %s!\n"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3159
 #, 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:3166
+#: g10/gpg.c:3164
 #, 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:3171
+#: g10/gpg.c:3169
 #, 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:3263
+#: g10/gpg.c:3261
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3272
 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:3295
+#: g10/gpg.c:3293
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3300
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3302
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3312
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3325
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3327
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3332
+#: g10/gpg.c:3330
 #, 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:3350
+#: g10/gpg.c:3348
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3361
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3376
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3378
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3381
 #, 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:3403
+#: g10/gpg.c:3401
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3410
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3435
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3443
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3447
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3468
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3553
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3557
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3568
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3580
+#: g10/gpg.c:3578
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3631
+#: g10/gpg.c:3629
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3639
+#: g10/gpg.c:3637
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3729
+#: g10/gpg.c:3727
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,%s'\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3844
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/gpg.c:3850
+#: g10/gpg.c:3848
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4160
 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:4162
 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:4195
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
@@ -2310,7 +2321,7 @@ msgstr "pobieranie kluczy z tego zbioru"
 msgid "make timestamp conflicts only a warning"
 msgstr "nie traktowa� konfliktu datownik�w jako b��du"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:368
+#: g10/gpgv.c:75 sm/gpgsm.c:372
 msgid "|FD|write status info to this FD"
 msgstr "|FD|pisanie opisu stanu do deskryptora FD"
 
@@ -6773,64 +6784,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: scd/scdaemon.c:105
+#: scd/scdaemon.c:108
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:357
+#: scd/scdaemon.c:114 sm/gpgsm.c:361
 #, fuzzy
 msgid "read options from file"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:124
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego adresata"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego adresata"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:129
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "bez odwo�a� do terminala"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:134
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:135
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "sprzeczne polecenia\n"
 
-#: scd/scdaemon.c:206
+#: scd/scdaemon.c:209
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Wywo�anie: gpgm [opcje] [pliki] (-h podaje pomoc)"
 
-#: scd/scdaemon.c:208
+#: scd/scdaemon.c:211
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:671
+#: scd/scdaemon.c:658
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1019
+#: scd/scdaemon.c:1006
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1024
+#: scd/scdaemon.c:1011
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6859,152 +6870,269 @@ msgstr "wersja %d protoko�u agenta nie jest obs�ugiwana\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:174
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr ""
+
+#: sm/certchain.c:195
+msgid "chain"
+msgstr ""
+
+#: sm/certchain.c:196
+#, fuzzy
+msgid "shell"
+msgstr "pomoc"
+
+#: sm/certchain.c:241
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "wersja %d protoko�u agenta nie jest obs�ugiwana\n"
 
-#: sm/certchain.c:212
+#: sm/certchain.c:279
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:250
+#: sm/certchain.c:317
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:260
+#: sm/certchain.c:327
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
 
-#: sm/certchain.c:267 sm/certchain.c:296
+#: sm/certchain.c:334 sm/certchain.c:363
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:271 sm/certchain.c:300
+#: sm/certchain.c:338 sm/certchain.c:367
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: sm/certchain.c:411
+#: sm/certchain.c:478
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:431
+#: sm/certchain.c:498
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: sm/certchain.c:675
+#: sm/certchain.c:742
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "UWAGA: klucz zosta� uniewa�niony"
 
-#: sm/certchain.c:684
+#: sm/certchain.c:752
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Poprawny certyfikat"
 
-#: sm/certchain.c:688
+#: sm/certchain.c:757
+msgid "the status of the certificate is unknown"
+msgstr ""
+
+#: sm/certchain.c:762
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Klucz dost�pny w: "
 
-#: sm/certchain.c:690
+#: sm/certchain.c:764
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:695
+#: sm/certchain.c:770
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
 
-#: sm/certchain.c:791
-#, fuzzy
-msgid "no issuer found in certificate"
-msgstr "Poprawny certyfikat"
-
-#: sm/certchain.c:820
+#: sm/certchain.c:799 sm/certchain.c:867
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "b��d przy odczycie certyfikatu: %s\n"
 
-#: sm/certchain.c:836
+#: sm/certchain.c:814 sm/certchain.c:899
 #, fuzzy
 msgid "certificate not yet valid"
 msgstr "Poprawne uniewa�nienie certyfikatu"
 
-#: sm/certchain.c:849
+#: sm/certchain.c:815 sm/certchain.c:900
+#, fuzzy
+msgid "root certificate not yet valid"
+msgstr "Poprawne uniewa�nienie certyfikatu"
+
+#: sm/certchain.c:816 sm/certchain.c:901
+#, fuzzy
+msgid "intermediate certificate not yet valid"
+msgstr "Poprawne uniewa�nienie certyfikatu"
+
+#: sm/certchain.c:829
 #, fuzzy
 msgid "certificate has expired"
 msgstr "b��d przy odczycie certyfikatu: %s\n"
 
-#: sm/certchain.c:892
-msgid "self-signed certificate has a BAD signature"
+#: sm/certchain.c:830
+#, fuzzy
+msgid "root certificate has expired"
+msgstr "b��d przy odczycie certyfikatu: %s\n"
+
+#: sm/certchain.c:831
+#, fuzzy
+msgid "intermediate certificate has expired"
+msgstr "b��d przy odczycie certyfikatu: %s\n"
+
+#: sm/certchain.c:873
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:960
+#: sm/certchain.c:882
 #, fuzzy
-msgid "root certificate is not marked trusted"
+msgid "certificate with invalid validity"
+msgstr "b��d przy odczycie certyfikatu: %s\n"
+
+#: sm/certchain.c:919
+msgid "signature not created during lifetime of certificate"
+msgstr ""
+
+#: sm/certchain.c:921
+msgid "certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:922
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:926
+#, fuzzy
+msgid "  (  signature created at "
+msgstr "             nowych podpis�w: %lu\n"
+
+#: sm/certchain.c:927
+#, fuzzy
+msgid "  (certificate created at "
+msgstr "Certyfikat uniewa�nienia zosta� utworzony.\n"
+
+#: sm/certchain.c:930
+#, fuzzy
+msgid "  (certificate valid from "
+msgstr "Poprawne uniewa�nienie certyfikatu"
+
+#: sm/certchain.c:931
+msgid "  (     issuer valid from "
 msgstr ""
-"Brak certyfikat�w o niezdefiniowanym poziomie zaufania.\n"
-"\n"
 
-#: sm/certchain.c:975
+#: sm/certchain.c:961
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Odcisk klucza:"
 
-#: sm/certchain.c:983
+#: sm/certchain.c:970
 #, fuzzy
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 "Brak certyfikat�w o niezdefiniowanym poziomie zaufania.\n"
 "\n"
 
-#: sm/certchain.c:998
+#: sm/certchain.c:983
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1004
+#: sm/certchain.c:989
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1046
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr ""
+
+#: sm/certchain.c:1110
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "Poprawny certyfikat"
+
+#: sm/certchain.c:1184
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:1253
+#, fuzzy
+msgid "root certificate is not marked trusted"
+msgstr ""
+"Brak certyfikat�w o niezdefiniowanym poziomie zaufania.\n"
+"\n"
+
+#: sm/certchain.c:1266
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
 
-#: sm/certchain.c:1041 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:157
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Poprawne uniewa�nienie certyfikatu"
 
-#: sm/certchain.c:1053
+#: sm/certchain.c:1307
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Poprawne uniewa�nienie certyfikatu"
 
-#: sm/certchain.c:1086
+#: sm/certchain.c:1340
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "sprawdzenie podpisu"
 
-#: sm/certchain.c:1116
+#: sm/certchain.c:1371
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1167
+#: sm/certchain.c:1422
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
+#: sm/certchain.c:1462 sm/certchain.c:1730
+#, fuzzy
+msgid "certificate is good\n"
+msgstr "Poprawne uniewa�nienie certyfikatu"
+
+#: sm/certchain.c:1463
+#, fuzzy
+msgid "intermediate certificate is good\n"
+msgstr "podw�jny certyfikat - usuni�ty"
+
+#: sm/certchain.c:1464
+#, fuzzy
+msgid "root certificate is good\n"
+msgstr ""
+"Brak certyfikat�w o niezdefiniowanym poziomie zaufania.\n"
+"\n"
+
+#: sm/certchain.c:1620
+msgid "switching to chain model"
+msgstr ""
+
+#: sm/certchain.c:1629
+#, c-format
+msgid "validation model used: %s"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "chain model"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "shell model"
+msgstr ""
+
 #: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
@@ -7052,7 +7180,7 @@ msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
 "\"%s\"\n"
-"S/N %s, ID %08lX, created %s"
+"S/N %s, ID 0x%08lX, created %s"
 msgstr ""
 "Musisz poda� has�o aby odbezpieczy� klucz tajny u�ytkownika:\n"
 "\"%.*s\".\n"
@@ -7062,7 +7190,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:131 sm/keylist.c:255
+#: sm/certlist.c:131 sm/keylist.c:258
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
@@ -7184,181 +7312,181 @@ msgstr "b��d podczas tworzenia has�a: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "b��d zapisu zbioru kluczy '%': %s\n"
 
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu pod dokumentem"
 
-#: sm/gpgsm.c:251
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list external keys"
 msgstr "lista kluczy prywatnych"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Poprawne uniewa�nienie certyfikatu"
 
-#: sm/gpgsm.c:256
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "import certificates"
 msgstr "Poprawny certyfikat"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:262
 #, fuzzy
 msgid "export certificates"
 msgstr "Poprawny certyfikat"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:268
 #, fuzzy
 msgid "change a passphrase"
 msgstr "zmiana has�a klucza"
 
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "opakowanie ASCII pliku wynikowego"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:287
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:296
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:302
+#: sm/gpgsm.c:304
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:305
+#: sm/gpgsm.c:309
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:312
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:315
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:319
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:323
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego adresata"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:325
 msgid "use the default key as default recipient"
 msgstr "domy�lny klucz jest domy�lnym adresatem"
 
-#: sm/gpgsm.c:338
+#: sm/gpgsm.c:342
 msgid "don't use the terminal at all"
 msgstr "bez odwo�a� do terminala"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:346
 msgid "force v3 signatures"
 msgstr "wymuszenie trzeciej wersji formatu podpis�w"
 
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:347
 msgid "always use a MDC for encryption"
 msgstr "do szyfrowania b�dzie u�ywany MDC"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:352
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: �adnych pyta�"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:353
 msgid "assume yes on most questions"
 msgstr "automatyczna odpowied� tak na wi�kszo�� pyta�"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:354
 msgid "assume no on most questions"
 msgstr "automatyczna odpowied� nie na wi�kszo�� pyta�"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:356
 msgid "add this keyring to the list of keyrings"
 msgstr "dodanie zbioru kluczy do u�ywanych"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:357
 msgid "add this secret keyring to the list"
 msgstr "dodanie zbioru kluczy tajnych do u�ywanych"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|ustawienie NAZWA jako domy�lnego klucza prywatnego"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:359
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|serwer kluczy w kt�rym b�d� poszukiwane"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:360
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAZWA| strona kodowa wy�wietlanego tekstu"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:364
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:375
+#: sm/gpgsm.c:379
 msgid "|FILE|load extension module FILE"
 msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
 
-#: sm/gpgsm.c:381
+#: sm/gpgsm.c:385
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|wymuszenie algorytmu szyfruj�cego NAZWA"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:387
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|wymuszenie algorytmu skr�tu  NAZWA"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:389
 msgid "|N|use compress algorithm N"
 msgstr "|N|wymuszenie algorytmu kompresji N"
 
-#: sm/gpgsm.c:522
+#: sm/gpgsm.c:528
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpgm [opcje] [pliki] (-h podaje pomoc)"
 
-#: sm/gpgsm.c:525
+#: sm/gpgsm.c:531
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7369,31 +7497,36 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: sm/gpgsm.c:604
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "spos�b u�ycia: gpgm [opcje]"
 
-#: sm/gpgsm.c:685
+#: sm/gpgsm.c:691
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
 
-#: sm/gpgsm.c:1237
+#: sm/gpgsm.c:713
+#, fuzzy, c-format
+msgid "unknown validation model `%s'\n"
+msgstr "nieznany domy�lny adresat ,,%s''\n"
+
+#: sm/gpgsm.c:1264
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1316
+#: sm/gpgsm.c:1344
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: sm/gpgsm.c:1334
+#: sm/gpgsm.c:1362
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nie mo�na zamkn�� ,,%s'': %s\n"
 
-#: sm/gpgsm.c:1529
+#: sm/gpgsm.c:1543
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7416,7 +7549,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:375
+#: sm/import.c:541 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
@@ -7500,7 +7633,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234
+#: sm/qualified.c:234 sm/verify.c:536
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7519,30 +7652,37 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
 
-#: sm/verify.c:386
+#: sm/verify.c:388
 #, fuzzy
 msgid "Signature made "
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: sm/verify.c:390
+#: sm/verify.c:392
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:391
-#, c-format
-msgid " using certificate ID %08lX\n"
-msgstr ""
+#: sm/verify.c:393
+#, fuzzy, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: sm/verify.c:507
+#: sm/verify.c:514
 #, fuzzy
 msgid "Good signature from"
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: sm/verify.c:508
+#: sm/verify.c:515
 #, fuzzy
 msgid "                aka"
 msgstr "                        alias \""
 
+#: sm/verify.c:533
+#, fuzzy
+msgid "This is a qualified signature\n"
+msgstr ""
+"\n"
+"To b�dzie podpis klucza nim samym.\n"
+
 #: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
@@ -7579,133 +7719,138 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:315
+#: tools/gpg-connect-agent.c:314
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:323
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:382
+#: tools/gpg-connect-agent.c:381
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "linia zbyt d�uga\n"
 
-#: tools/gpg-connect-agent.c:386
+#: tools/gpg-connect-agent.c:385
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:458
+#: tools/gpg-connect-agent.c:457
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "nieznany domy�lny adresat ,,%s''\n"
 
-#: tools/gpg-connect-agent.c:466
+#: tools/gpg-connect-agent.c:465
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
 
-#: tools/gpg-connect-agent.c:474
+#: tools/gpg-connect-agent.c:473
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: tools/gpg-connect-agent.c:784
+#: tools/gpg-connect-agent.c:789
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "b��d przy wysy�aniu do ,,%s'': %s\n"
 
-#: tools/gpg-connect-agent.c:793
+#: tools/gpg-connect-agent.c:798
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "b��d przy wysy�aniu do ,,%s'': %s\n"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
+#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
-#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
+#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "umo�liwienie pe�nego �ledzenia programu"
 
-#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
-#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:501
+#: tools/gpgconf-comp.c:492
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:505
+#: tools/gpgconf-comp.c:496
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:509
+#: tools/gpgconf-comp.c:500
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:510
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:638
+#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#, fuzzy
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
+
+#: tools/gpgconf-comp.c:635
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:640
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|ALG|wymuszenie algorytmu szyfruj�cego ALG dla has�a"
 
-#: tools/gpgconf-comp.c:705
+#: tools/gpgconf-comp.c:708
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:749
+#: tools/gpgconf-comp.c:752
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:785
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:806
+#: tools/gpgconf-comp.c:809
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:814
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:848
+#: tools/gpgconf-comp.c:851
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2681
+#: tools/gpgconf-comp.c:2684
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8344,9 +8489,6 @@ msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
 #~ msgid "q"
 #~ msgstr "w"
 
-#~ msgid "help"
-#~ msgstr "pomoc"
-
 #~ msgid "list"
 #~ msgstr "lista"
 
diff --git a/po/pt.po b/po/pt.po
index 84aed0183..22eb77f85 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-07-05 18:01+0200\n"
+"POT-Creation-Date: 2007-08-10 15:49+0200\n"
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -22,54 +22,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: agent/call-pinentry.c:426
+#: agent/call-pinentry.c:436
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:429
+#: agent/call-pinentry.c:439
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/call-pinentry.c:476
+#: agent/call-pinentry.c:486
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
+#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
 #, fuzzy
 msgid "PIN too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: agent/call-pinentry.c:497
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: agent/call-pinentry.c:505
+#: agent/call-pinentry.c:515
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter inv�lido no nome\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:520
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:522
+#: agent/call-pinentry.c:532
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorreto"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:533
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "frase secreta incorrecta"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:569
 #, fuzzy
 msgid "Passphrase"
 msgstr "frase secreta incorrecta"
@@ -86,14 +86,14 @@ msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
 #: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
-#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1796
+#: sm/gpgsm.c:1833 sm/gpgsm.c:1871 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -180,35 +180,46 @@ msgstr[1] ""
 msgid "Take this one anyway"
 msgstr "Usar esta chave de qualquer modo? "
 
-#: agent/genkey.c:99
+#: agent/genkey.c:99 agent/genkey.c:114
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Insira a frase secreta\n"
 
-#: agent/genkey.c:144
+#: agent/genkey.c:107
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+
+#: agent/genkey.c:113
+msgid "Yes, protection is not needed"
+msgstr ""
+
+#: agent/genkey.c:158
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
+#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
 #: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:263
+#: agent/genkey.c:280
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -218,248 +229,248 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:103
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
-#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
 #: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detalhado"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
-#: sm/gpgsm.c:337
+#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:109
+#: agent/gpg-agent.c:118 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:119
+#: agent/gpg-agent.c:125 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:125
+#: agent/gpg-agent.c:126
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "procurar chaves num servidor de chaves"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:129
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualizar a base de dados de confian�a"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:145
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:206 sm/gpgsm.c:525 tools/gpg-connect-agent.c:124
 #: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:262
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
+#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
-#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:340 sm/gpgsm.c:772 sm/gpgsm.c:775 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
+#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:863
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: ficheiro de op��es por omiss�o `%s' inexistente\n"
 
-#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
-#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: scd/scdaemon.c:421 sm/gpgsm.c:867 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
+#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:874
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
-#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:921
+#: agent/gpg-agent.c:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
+#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:908
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
+#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
-#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
+#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
+#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
+#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directoria criada\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1377
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "base de dados de confian�a: leitura falhou (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1381
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1497
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1519
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
+#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
+#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ignorado: %s\n"
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1752
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
-#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:751
+#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
 
-#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
-#: tools/gpg-connect-agent.c:762
+#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "a vers�o %d do protocolo gpg-agent n�o � suportada\n"
@@ -524,42 +535,42 @@ msgstr "erro na cria��o da frase secreta: %s\n"
 msgid "cancelled\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: agent/trustlist.c:131 agent/trustlist.c:319
+#: agent/trustlist.c:132 agent/trustlist.c:322
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/trustlist.c:146
+#: agent/trustlist.c:147
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: agent/trustlist.c:166 agent/trustlist.c:174
+#: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:180
+#: agent/trustlist.c:181
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "partes da chave secreta n�o dispon�veis\n"
 
-#: agent/trustlist.c:215
+#: agent/trustlist.c:216
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "armadura: %s\n"
 
-#: agent/trustlist.c:241 agent/trustlist.c:248
+#: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:280
+#: agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/trustlist.c:381 agent/trustlist.c:420
+#: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -572,7 +583,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:496
+#: agent/trustlist.c:507
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -582,7 +593,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:505
+#: agent/trustlist.c:516
 msgid "Correct"
 msgstr ""
 
@@ -594,58 +605,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:525
+#: agent/trustlist.c:536
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 #, fuzzy
 msgid "Yes"
 msgstr "sim"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:393
+#: common/exechelp.c:302 common/exechelp.c:390
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: common/exechelp.c:369 common/exechelp.c:426
+#: common/exechelp.c:366 common/exechelp.c:423
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: common/exechelp.c:405 common/exechelp.c:635
+#: common/exechelp.c:402 common/exechelp.c:632
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp.c:461 common/exechelp.c:504
+#: common/exechelp.c:458 common/exechelp.c:501
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:469
+#: common/exechelp.c:466
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: common/exechelp.c:475 common/exechelp.c:515
+#: common/exechelp.c:472 common/exechelp.c:512
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp.c:510
+#: common/exechelp.c:507
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:521
+#: common/exechelp.c:518
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -664,26 +675,26 @@ msgstr "[Utilizador n�o encontrado]"
 msgid "gpg-agent is not available in this session\n"
 msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
-#: common/simple-pwquery.c:376
+#: common/simple-pwquery.c:373
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel ligar a `%s': %s\n"
 
-#: common/simple-pwquery.c:387
+#: common/simple-pwquery.c:384
 msgid "communication problem with gpg-agent\n"
 msgstr "problemas na comunica��o com o gpg-agent\n"
 
-#: common/simple-pwquery.c:397
+#: common/simple-pwquery.c:394
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
 
-#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+#: common/simple-pwquery.c:557 common/simple-pwquery.c:653
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+#: common/simple-pwquery.c:572 common/simple-pwquery.c:659
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
@@ -866,7 +877,7 @@ msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 msgid "not human readable"
 msgstr "n�o leg�vel por humanos"
 
-#: g10/card-util.c:62 g10/card-util.c:305
+#: g10/card-util.c:62 g10/card-util.c:308
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "chave secreta n�o dispon�vel"
@@ -876,166 +887,166 @@ msgstr "chave secreta n�o dispon�vel"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1391 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
 #, 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:102 g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
 #: g10/keygen.c:1644
 msgid "Your selection? "
 msgstr "Op��o? "
 
-#: g10/card-util.c:215 g10/card-util.c:265
+#: g10/card-util.c:218 g10/card-util.c:268
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:412
+#: g10/card-util.c:415
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 #, fuzzy
 msgid "unspecified"
 msgstr "Nenhum motivo especificado"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 #, fuzzy
 msgid "not forced"
 msgstr "n�o processado"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:521
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:523
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:525
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:539
+#: g10/card-util.c:542
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:544
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:562
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:580
+#: g10/card-util.c:583
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/card-util.c:588
+#: g10/card-util.c:591
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
+#: g10/card-util.c:689 g10/card-util.c:758 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:694
+#: g10/card-util.c:697
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:704
+#: g10/card-util.c:707
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:763
+#: g10/card-util.c:766
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:773
+#: g10/card-util.c:776
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:793
+#: g10/card-util.c:796
 #, fuzzy
 msgid "Language preferences: "
 msgstr "prefer�ncias actualizadas"
 
-#: g10/card-util.c:801
+#: g10/card-util.c:804
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:813
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
 
-#: g10/card-util.c:831
+#: g10/card-util.c:834
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:845
+#: g10/card-util.c:848
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/card-util.c:866
+#: g10/card-util.c:869
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:889
+#: g10/card-util.c:892
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/card-util.c:937
+#: g10/card-util.c:940
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:941
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/card-util.c:947
+#: g10/card-util.c:950
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/card-util.c:1031
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1051 g10/card-util.c:1060
+#: g10/card-util.c:1054 g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1075
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1084
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1043,136 +1054,136 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1115
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/card-util.c:1117 g10/card-util.c:1194
+#: g10/card-util.c:1120 g10/card-util.c:1197
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/card-util.c:1118 g10/card-util.c:1196
+#: g10/card-util.c:1121 g10/card-util.c:1199
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1198
+#: g10/card-util.c:1122 g10/card-util.c:1201
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1135 g10/card-util.c:1214 g10/keyedit.c:945
+#: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
 #: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/card-util.c:1191
+#: g10/card-util.c:1194
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "motivo da revoca��o: "
 
-#: g10/card-util.c:1226
+#: g10/card-util.c:1229
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1234
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1239
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1304 g10/keyedit.c:1362
+#: g10/card-util.c:1307 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1309
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1307 g10/keyedit.c:1365
+#: g10/card-util.c:1310 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1312
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/card-util.c:1312
+#: g10/card-util.c:1315
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1313
+#: g10/card-util.c:1316
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1317
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1315
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:1316
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confian�a"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1320
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1322
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1323
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1324
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1325
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442 g10/keyedit.c:1634
+#: g10/card-util.c:1445 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1480
+#: g10/card-util.c:1483
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1511
+#: g10/card-util.c:1514
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1513
+#: g10/card-util.c:1516
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/card-util.c:1587 g10/keyedit.c:2255
+#: g10/card-util.c:1590 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
@@ -1180,7 +1191,7 @@ msgstr "Comando inv�lido (tente \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output n�o funciona para este comando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
@@ -1485,7 +1496,7 @@ msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1501,27 +1512,27 @@ msgstr "|[ficheiro]|fazer uma assinatura"
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:372 sm/gpgsm.c:244
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "cifrar dados"
 
-#: g10/gpg.c:375 sm/gpgsm.c:246
+#: g10/gpg.c:375 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar apenas com cifra sim�trica"
 
-#: g10/gpg.c:377 sm/gpgsm.c:247
+#: g10/gpg.c:377 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "decifrar dados (ac��o por omiss�o)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:248
+#: g10/gpg.c:379 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:381 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "listar as chaves"
 
@@ -1534,11 +1545,11 @@ msgstr "listar as chaves e as assinaturas"
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:385 sm/gpgsm.c:254
+#: g10/gpg.c:385 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:386 sm/gpgsm.c:252
+#: g10/gpg.c:386 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
@@ -1574,11 +1585,11 @@ msgstr "gerar um certificado de revoga��o"
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:397 sm/gpgsm.c:257
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor de chaves"
 
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor de chaves"
 
@@ -1614,11 +1625,11 @@ msgstr "actualizar a base de dados de confian�a"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:430 sm/gpgsm.c:262
+#: g10/gpg.c:430 sm/gpgsm.c:264
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
 #: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1629,35 +1640,35 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:279
+#: g10/gpg.c:434 sm/gpgsm.c:281
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:436 sm/gpgsm.c:291
+#: g10/gpg.c:436 sm/gpgsm.c:293
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:447 sm/gpgsm.c:327
+#: g10/gpg.c:447 sm/gpgsm.c:331
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou decifrar"
 
-#: g10/gpg.c:448 sm/gpgsm.c:330
+#: g10/gpg.c:448 sm/gpgsm.c:334
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desactiva)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:332
+#: g10/gpg.c:453 sm/gpgsm.c:336
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "usar como ficheiro de sa�da"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
@@ -1673,7 +1684,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:393
+#: g10/gpg.c:553 sm/gpgsm.c:397
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1681,7 +1692,7 @@ msgstr ""
 "@\n"
 "(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:396
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1719,7 +1730,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:532
+#: g10/gpg.c:781 sm/gpgsm.c:538
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1747,7 +1758,7 @@ msgstr "Compress�o: "
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:669
+#: g10/gpg.c:1045 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
@@ -1823,463 +1834,463 @@ msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1554
+#: 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:1556
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1562
+#: 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:1564
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1827
+#: g10/gpg.c:1825
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1981
 #, 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:2243 g10/gpg.c:2884 g10/gpg.c:2896
+#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2401 g10/gpg.c:2413
+#: g10/gpg.c:2399 g10/gpg.c:2411
 #, 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:2495
+#: g10/gpg.c:2493
 #, 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:2518 g10/gpg.c:2713 g10/keyedit.c:4084
+#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2528
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2531
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2538
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2541
 msgid "invalid import options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2548
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2551
 msgid "invalid export options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2558
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2561
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2569
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2571
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2573
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2575
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2579
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2581
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2585
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2587
 #, 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
+#: g10/gpg.c:2589
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2591
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2598
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2608
 #, 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:2784
+#: g10/gpg.c:2782
 #, 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:2787
+#: g10/gpg.c:2785
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2873 sm/gpgsm.c:1220
+#: g10/gpg.c:2871 sm/gpgsm.c:1247
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2875
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrep�e %s\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2884
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2887
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2902
 #, 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:2918
+#: g10/gpg.c:2916
 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:2924
+#: g10/gpg.c:2922
 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:2930
+#: g10/gpg.c:2928
 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:2943
+#: g10/gpg.c:2941
 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:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
+#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1303
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
+#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1311
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3025
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3040
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3042
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3044
 #, 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:3048
+#: g10/gpg.c:3046
 #, 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:3050
+#: g10/gpg.c:3048
 #, 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:3053
+#: g10/gpg.c:3051
 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:3057
+#: g10/gpg.c:3055
 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:3064
+#: g10/gpg.c:3062
 msgid "invalid default preferences\n"
 msgstr "prefer�ncias por omiss�o inv�lidas\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3071
 msgid "invalid personal cipher preferences\n"
 msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3075
 msgid "invalid personal digest preferences\n"
 msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3079
 msgid "invalid personal compress preferences\n"
 msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
 
-#: g10/gpg.c:3114
+#: g10/gpg.c:3112
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3159
 #, 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:3166
+#: g10/gpg.c:3164
 #, 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:3171
+#: g10/gpg.c:3169
 #, 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:3263
+#: g10/gpg.c:3261
 #, 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:3274
+#: g10/gpg.c:3272
 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:3295
+#: g10/gpg.c:3293
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3300
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3302
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3312
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3325
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3327
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3332
+#: g10/gpg.c:3330
 #, 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:3350
+#: g10/gpg.c:3348
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3361
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3376
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3378
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3381
 #, 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:3403
+#: g10/gpg.c:3401
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3410
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3435
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3443
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3447
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3468
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3553
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3555
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3557
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3568
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3580
+#: g10/gpg.c:3578
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/gpg.c:3631
+#: g10/gpg.c:3629
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3639
+#: g10/gpg.c:3637
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/gpg.c:3729
+#: g10/gpg.c:3727
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3844
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/gpg.c:3850
+#: g10/gpg.c:3848
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4160
 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:4162
 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:4195
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
@@ -2294,7 +2305,7 @@ msgstr "Remover esta chave do porta-chaves?"
 msgid "make timestamp conflicts only a warning"
 msgstr "conflito de \"timestamp\""
 
-#: g10/gpgv.c:75 sm/gpgsm.c:368
+#: g10/gpgv.c:75 sm/gpgsm.c:372
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DF|escrever informa��es de estado para o\n"
@@ -6749,64 +6760,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: scd/scdaemon.c:105
+#: scd/scdaemon.c:108
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:357
+#: scd/scdaemon.c:114 sm/gpgsm.c:361
 #, fuzzy
 msgid "read options from file"
 msgstr "a ler op��es de `%s'\n"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:124
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:129
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "nunca usar o terminal"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:134
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:135
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "comandos em conflito\n"
 
-#: scd/scdaemon.c:206
+#: scd/scdaemon.c:209
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: scd/scdaemon.c:208
+#: scd/scdaemon.c:211
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:671
+#: scd/scdaemon.c:658
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1019
+#: scd/scdaemon.c:1006
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1024
+#: scd/scdaemon.c:1011
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6835,143 +6846,257 @@ msgstr "a vers�o %d do protocolo gpg-agent n�o � suportada\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:174
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr ""
+
+#: sm/certchain.c:195
+msgid "chain"
+msgstr ""
+
+#: sm/certchain.c:196
+#, fuzzy
+msgid "shell"
+msgstr "help"
+
+#: sm/certchain.c:241
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "a vers�o %d do protocolo gpg-agent n�o � suportada\n"
 
-#: sm/certchain.c:212
+#: sm/certchain.c:279
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:250
+#: sm/certchain.c:317
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:260
+#: sm/certchain.c:327
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/certchain.c:267 sm/certchain.c:296
+#: sm/certchain.c:334 sm/certchain.c:363
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:271 sm/certchain.c:300
+#: sm/certchain.c:338 sm/certchain.c:367
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: sm/certchain.c:411
+#: sm/certchain.c:478
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:431
+#: sm/certchain.c:498
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: sm/certchain.c:675
+#: sm/certchain.c:742
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: a chave foi revogada"
 
-#: sm/certchain.c:684
+#: sm/certchain.c:752
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "certificado incorrecto"
 
-#: sm/certchain.c:688
+#: sm/certchain.c:757
+msgid "the status of the certificate is unknown"
+msgstr ""
+
+#: sm/certchain.c:762
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: sm/certchain.c:690
+#: sm/certchain.c:764
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:695
+#: sm/certchain.c:770
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "verifica��o da assinatura criada falhou: %s\n"
 
-#: sm/certchain.c:791
-#, fuzzy
-msgid "no issuer found in certificate"
-msgstr "gerar um certificado de revoga��o"
-
-#: sm/certchain.c:820
+#: sm/certchain.c:799 sm/certchain.c:867
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:836
+#: sm/certchain.c:814 sm/certchain.c:899
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:849
+#: sm/certchain.c:815 sm/certchain.c:900
+#, fuzzy
+msgid "root certificate not yet valid"
+msgstr "a escrever chave privada para `%s'\n"
+
+#: sm/certchain.c:816 sm/certchain.c:901
+msgid "intermediate certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:829
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Esta chave expirou!"
 
-#: sm/certchain.c:892
-msgid "self-signed certificate has a BAD signature"
+#: sm/certchain.c:830
+#, fuzzy
+msgid "root certificate has expired"
+msgstr "Esta chave expirou!"
+
+#: sm/certchain.c:831
+#, fuzzy
+msgid "intermediate certificate has expired"
+msgstr "Esta chave expirou!"
+
+#: sm/certchain.c:873
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:960
-msgid "root certificate is not marked trusted"
+#: sm/certchain.c:882
+#, fuzzy
+msgid "certificate with invalid validity"
+msgstr "Esta chave expirou!"
+
+#: sm/certchain.c:919
+msgid "signature not created during lifetime of certificate"
+msgstr ""
+
+#: sm/certchain.c:921
+msgid "certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:922
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:926
+#, fuzzy
+msgid "  (  signature created at "
+msgstr "        novas assinaturas: %lu\n"
+
+#: sm/certchain.c:927
+#, fuzzy
+msgid "  (certificate created at "
+msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
+
+#: sm/certchain.c:930
+#, fuzzy
+msgid "  (certificate valid from "
+msgstr "certificado incorrecto"
+
+#: sm/certchain.c:931
+msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:975
+#: sm/certchain.c:961
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "mostra impress�o digital"
 
-#: sm/certchain.c:983
+#: sm/certchain.c:970
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:998
+#: sm/certchain.c:983
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1004
+#: sm/certchain.c:989
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1046
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr ""
+
+#: sm/certchain.c:1110
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "gerar um certificado de revoga��o"
+
+#: sm/certchain.c:1184
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:1253
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:1266
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "verifica��o da assinatura criada falhou: %s\n"
 
-#: sm/certchain.c:1041 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1053
+#: sm/certchain.c:1307
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1086
+#: sm/certchain.c:1340
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verificar uma assinatura"
 
-#: sm/certchain.c:1116
+#: sm/certchain.c:1371
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1167
+#: sm/certchain.c:1422
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
+#: sm/certchain.c:1462 sm/certchain.c:1730
+#, fuzzy
+msgid "certificate is good\n"
+msgstr "prefer�ncia %c%lu duplicada\n"
+
+#: sm/certchain.c:1463
+#, fuzzy
+msgid "intermediate certificate is good\n"
+msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
+
+#: sm/certchain.c:1464
+#, fuzzy
+msgid "root certificate is good\n"
+msgstr "certificado incorrecto"
+
+#: sm/certchain.c:1620
+msgid "switching to chain model"
+msgstr ""
+
+#: sm/certchain.c:1629
+#, c-format
+msgid "validation model used: %s"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "chain model"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "shell model"
+msgstr ""
+
 #: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
@@ -7019,7 +7144,7 @@ msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
 "\"%s\"\n"
-"S/N %s, ID %08lX, created %s"
+"S/N %s, ID 0x%08lX, created %s"
 msgstr ""
 "Precisa de uma frase secreta para desbloquear a chave secreta do "
 "utilizador:\n"
@@ -7031,7 +7156,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:131 sm/keylist.c:255
+#: sm/certlist.c:131 sm/keylist.c:258
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
@@ -7153,185 +7278,185 @@ msgstr "erro na cria��o da frase secreta: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "a escrever para `%s'\n"
 
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: sm/gpgsm.c:251
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list external keys"
 msgstr "listar as chaves secretas"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list certificate chain"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:256
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "remover chaves do porta-chaves p�blico"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "import certificates"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:262
 #, fuzzy
 msgid "export certificates"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:268
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muda a frase secreta"
 
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "criar sa�da com armadura ascii"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:287
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:296
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:302
+#: sm/gpgsm.c:304
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:305
+#: sm/gpgsm.c:309
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:312
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:315
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:319
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:323
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:325
 msgid "use the default key as default recipient"
 msgstr "usar a chave por omiss�o como destinat�rio por omiss�o"
 
-#: sm/gpgsm.c:338
+#: sm/gpgsm.c:342
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:346
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:347
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para cifrar"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:352
 msgid "batch mode: never ask"
 msgstr "modo n�o-interactivo: nunca perguntar"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:353
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:354
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:356
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 "adicionar este porta-chaves\n"
 "� lista de porta-chaves"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:357
 msgid "add this secret keyring to the list"
 msgstr "adicionar este porta-chaves secreto � lista"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omiss�o"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:359
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:360
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:364
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:375
+#: sm/gpgsm.c:379
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: sm/gpgsm.c:381
+#: sm/gpgsm.c:385
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:387
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:389
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: sm/gpgsm.c:522
+#: sm/gpgsm.c:528
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: sm/gpgsm.c:525
+#: sm/gpgsm.c:531
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7342,31 +7467,36 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: sm/gpgsm.c:604
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpg [op��es] "
 
-#: sm/gpgsm.c:685
+#: sm/gpgsm.c:691
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "imposs�vel ligar a `%s': %s\n"
 
-#: sm/gpgsm.c:1237
+#: sm/gpgsm.c:713
+#, fuzzy, c-format
+msgid "unknown validation model `%s'\n"
+msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
+
+#: sm/gpgsm.c:1264
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1316
+#: sm/gpgsm.c:1344
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: sm/gpgsm.c:1334
+#: sm/gpgsm.c:1362
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "imposs�vel fechar `%s': %s\n"
 
-#: sm/gpgsm.c:1529
+#: sm/gpgsm.c:1543
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7389,7 +7519,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:375
+#: sm/import.c:541 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -7473,7 +7603,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234
+#: sm/qualified.c:234 sm/verify.c:536
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7492,30 +7622,37 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "verifica��o da assinatura criada falhou: %s\n"
 
-#: sm/verify.c:386
+#: sm/verify.c:388
 #, fuzzy
 msgid "Signature made "
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: sm/verify.c:390
+#: sm/verify.c:392
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:391
-#, c-format
-msgid " using certificate ID %08lX\n"
-msgstr ""
+#: sm/verify.c:393
+#, fuzzy, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: sm/verify.c:507
+#: sm/verify.c:514
 #, fuzzy
 msgid "Good signature from"
 msgstr "Assinatura correcta de \""
 
-#: sm/verify.c:508
+#: sm/verify.c:515
 #, fuzzy
 msgid "                aka"
 msgstr "                   ou \""
 
+#: sm/verify.c:533
+#, fuzzy
+msgid "This is a qualified signature\n"
+msgstr ""
+"\n"
+"Isto ser� uma auto-assinatura.\n"
+
 #: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
@@ -7552,134 +7689,139 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:315
+#: tools/gpg-connect-agent.c:314
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:323
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:382
+#: tools/gpg-connect-agent.c:381
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "frase secreta demasiado longa\n"
 
-#: tools/gpg-connect-agent.c:386
+#: tools/gpg-connect-agent.c:385
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:458
+#: tools/gpg-connect-agent.c:457
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
 
-#: tools/gpg-connect-agent.c:466
+#: tools/gpg-connect-agent.c:465
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: tools/gpg-connect-agent.c:474
+#: tools/gpg-connect-agent.c:473
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: tools/gpg-connect-agent.c:784
+#: tools/gpg-connect-agent.c:789
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:793
+#: tools/gpg-connect-agent.c:798
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
+#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
-#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
+#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
-#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:501
+#: tools/gpgconf-comp.c:492
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:505
+#: tools/gpgconf-comp.c:496
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:509
+#: tools/gpgconf-comp.c:500
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:510
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:638
+#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#, fuzzy
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NOME|cifrar para NOME"
+
+#: tools/gpgconf-comp.c:635
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:640
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: tools/gpgconf-comp.c:705
+#: tools/gpgconf-comp.c:708
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:749
+#: tools/gpgconf-comp.c:752
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:785
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:806
+#: tools/gpgconf-comp.c:809
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:814
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:848
+#: tools/gpgconf-comp.c:851
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2681
+#: tools/gpgconf-comp.c:2684
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8281,9 +8423,6 @@ msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 #~ msgid "q"
 #~ msgstr "q"
 
-#~ msgid "help"
-#~ msgstr "help"
-
 #~ msgid "list"
 #~ msgstr "list"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2aea5c71b..30ea67f2a 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-07-05 18:01+0200\n"
+"POT-Creation-Date: 2007-08-10 15:49+0200\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -26,54 +26,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: agent/call-pinentry.c:426
+#: agent/call-pinentry.c:436
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:429
+#: agent/call-pinentry.c:439
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Por favor digite a frase secreta"
 
-#: agent/call-pinentry.c:476
+#: agent/call-pinentry.c:486
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
+#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
 #, fuzzy
 msgid "PIN too long"
 msgstr "linha muito longa\n"
 
-#: agent/call-pinentry.c:497
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "linha muito longa\n"
 
-#: agent/call-pinentry.c:505
+#: agent/call-pinentry.c:515
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caractere inv�lido no nome\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:520
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:522
+#: agent/call-pinentry.c:532
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorreto"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:533
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "frase secreta incorreta"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:569
 #, fuzzy
 msgid "Passphrase"
 msgstr "frase secreta incorreta"
@@ -90,14 +90,14 @@ msgstr "algoritmo de prote��o %d n�o � suportado\n"
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
 #: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
-#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1796
+#: sm/gpgsm.c:1833 sm/gpgsm.c:1871 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -185,35 +185,46 @@ msgstr[1] ""
 msgid "Take this one anyway"
 msgstr "Usa esta chave de qualquer modo? "
 
-#: agent/genkey.c:99
+#: agent/genkey.c:99 agent/genkey.c:114
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Digite a frase secreta: "
 
-#: agent/genkey.c:144
+#: agent/genkey.c:107
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+
+#: agent/genkey.c:113
+msgid "Yes, protection is not needed"
+msgstr ""
+
+#: agent/genkey.c:158
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
+#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
 #: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:263
+#: agent/genkey.c:280
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -223,245 +234,245 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:103
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
-#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
 #: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detalhado"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
-#: sm/gpgsm.c:337
+#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:109
+#: agent/gpg-agent.c:118 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:119
+#: agent/gpg-agent.c:125 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:125
+#: agent/gpg-agent.c:126
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "exportar chaves para um servidor"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:129
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:145
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:206 sm/gpgsm.c:525 tools/gpg-connect-agent.c:124
 #: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:262
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
+#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
-#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:340 sm/gpgsm.c:772 sm/gpgsm.c:775 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
+#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:863
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
-#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: scd/scdaemon.c:421 sm/gpgsm.c:867 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
+#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:874
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, fuzzy, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
-#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:921
+#: agent/gpg-agent.c:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
+#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:908
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: imposs�vel criar diret�rio: %s\n"
 
-#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
+#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
+#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
+#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
+#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: diret�rio criado\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1377
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1381
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: imposs�vel criar diret�rio: %s\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1497
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1519
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
+#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
+#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu chaves ignoradas\n"
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1752
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:751
+#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
-#: tools/gpg-connect-agent.c:762
+#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:767
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
@@ -525,42 +536,42 @@ msgstr "erro na cria��o da frase secreta: %s\n"
 msgid "cancelled\n"
 msgstr ""
 
-#: agent/trustlist.c:131 agent/trustlist.c:319
+#: agent/trustlist.c:132 agent/trustlist.c:322
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/trustlist.c:146
+#: agent/trustlist.c:147
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: agent/trustlist.c:166 agent/trustlist.c:174
+#: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:180
+#: agent/trustlist.c:181
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: agent/trustlist.c:215
+#: agent/trustlist.c:216
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "erro de leitura: %s\n"
 
-#: agent/trustlist.c:241 agent/trustlist.c:248
+#: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:280
+#: agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/trustlist.c:381 agent/trustlist.c:420
+#: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -573,7 +584,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:496
+#: agent/trustlist.c:507
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -583,7 +594,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:505
+#: agent/trustlist.c:516
 msgid "Correct"
 msgstr ""
 
@@ -595,58 +606,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:525
+#: agent/trustlist.c:536
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 #, fuzzy
 msgid "Yes"
 msgstr "sim"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:393
+#: common/exechelp.c:302 common/exechelp.c:390
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: common/exechelp.c:369 common/exechelp.c:426
+#: common/exechelp.c:366 common/exechelp.c:423
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "imposs�vel abrir arquivo: %s\n"
 
-#: common/exechelp.c:405 common/exechelp.c:635
+#: common/exechelp.c:402 common/exechelp.c:632
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp.c:461 common/exechelp.c:504
+#: common/exechelp.c:458 common/exechelp.c:501
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:469
+#: common/exechelp.c:466
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: common/exechelp.c:475 common/exechelp.c:515
+#: common/exechelp.c:472 common/exechelp.c:512
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp.c:510
+#: common/exechelp.c:507
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:521
+#: common/exechelp.c:518
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -665,24 +676,24 @@ msgstr "%s: usu�rio n�o encontrado\n"
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: common/simple-pwquery.c:376
+#: common/simple-pwquery.c:373
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: common/simple-pwquery.c:387
+#: common/simple-pwquery.c:384
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:397
+#: common/simple-pwquery.c:394
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+#: common/simple-pwquery.c:557 common/simple-pwquery.c:653
 msgid "canceled by user\n"
 msgstr ""
 
-#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+#: common/simple-pwquery.c:572 common/simple-pwquery.c:659
 msgid "problem with the agent\n"
 msgstr ""
 
@@ -867,7 +878,7 @@ msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 msgid "not human readable"
 msgstr ""
 
-#: g10/card-util.c:62 g10/card-util.c:305
+#: g10/card-util.c:62 g10/card-util.c:308
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "chave secreta n�o dispon�vel"
@@ -877,167 +888,167 @@ msgstr "chave secreta n�o dispon�vel"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1391 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
 #, 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:102 g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
 #: g10/keygen.c:1644
 msgid "Your selection? "
 msgstr "Sua op��o? "
 
-#: g10/card-util.c:215 g10/card-util.c:265
+#: g10/card-util.c:218 g10/card-util.c:268
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:412
+#: g10/card-util.c:415
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 #, fuzzy
 msgid "not forced"
 msgstr "n�o processado(s)"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:521
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:523
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:525
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:539
+#: g10/card-util.c:542
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:544
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:562
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:580
+#: g10/card-util.c:583
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/card-util.c:588
+#: g10/card-util.c:591
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
+#: g10/card-util.c:689 g10/card-util.c:758 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:694
+#: g10/card-util.c:697
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:704
+#: g10/card-util.c:707
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:763
+#: g10/card-util.c:766
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:773
+#: g10/card-util.c:776
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:793
+#: g10/card-util.c:796
 #, fuzzy
 msgid "Language preferences: "
 msgstr "lista prefer�ncias"
 
-#: g10/card-util.c:801
+#: g10/card-util.c:804
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:813
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/card-util.c:831
+#: g10/card-util.c:834
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:845
+#: g10/card-util.c:848
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: g10/card-util.c:866
+#: g10/card-util.c:869
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Impress�o digital:"
 
-#: g10/card-util.c:889
+#: g10/card-util.c:892
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: g10/card-util.c:937
+#: g10/card-util.c:940
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:941
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/card-util.c:947
+#: g10/card-util.c:950
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/card-util.c:1031
+#: g10/card-util.c:1034
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/card-util.c:1051 g10/card-util.c:1060
+#: g10/card-util.c:1054 g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1075
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1084
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1045,137 +1056,137 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1115
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/card-util.c:1117 g10/card-util.c:1194
+#: g10/card-util.c:1120 g10/card-util.c:1197
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/card-util.c:1118 g10/card-util.c:1196
+#: g10/card-util.c:1121 g10/card-util.c:1199
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1198
+#: g10/card-util.c:1122 g10/card-util.c:1201
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1135 g10/card-util.c:1214 g10/keyedit.c:945
+#: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
 #: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/card-util.c:1191
+#: g10/card-util.c:1194
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/card-util.c:1226
+#: g10/card-util.c:1229
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1234
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1239
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1304 g10/keyedit.c:1362
+#: g10/card-util.c:1307 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1309
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1307 g10/keyedit.c:1365
+#: g10/card-util.c:1310 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1312
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/card-util.c:1312
+#: g10/card-util.c:1315
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1313
+#: g10/card-util.c:1316
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1317
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1315
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:1316
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confian�a"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1320
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1322
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1323
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1324
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1325
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442 g10/keyedit.c:1634
+#: g10/card-util.c:1445 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1480
+#: g10/card-util.c:1483
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1511
+#: g10/card-util.c:1514
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1513
+#: g10/card-util.c:1516
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
 # help ou ajuda ???
-#: g10/card-util.c:1587 g10/keyedit.c:2255
+#: g10/card-util.c:1590 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
@@ -1183,7 +1194,7 @@ msgstr "Comando inv�lido (tente \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
@@ -1484,7 +1495,7 @@ msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1500,29 +1511,29 @@ msgstr "|[arquivo]|fazer uma assinatura"
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:372 sm/gpgsm.c:244
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/gpg.c:375 sm/gpgsm.c:246
+#: g10/gpg.c:375 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "sim�trica"
 
-#: g10/gpg.c:377 sm/gpgsm.c:247
+#: g10/gpg.c:377 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padr�o)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:248
+#: g10/gpg.c:379 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:381 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "listar as chaves"
 
@@ -1535,11 +1546,11 @@ msgstr "listar as chaves e as assinaturas"
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:385 sm/gpgsm.c:254
+#: g10/gpg.c:385 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:386 sm/gpgsm.c:252
+#: g10/gpg.c:386 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
@@ -1577,11 +1588,11 @@ msgstr "gerar um certificado de revoga��o"
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:397 sm/gpgsm.c:257
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
@@ -1619,11 +1630,11 @@ msgstr "atualizar o banco de dados de confiabilidade"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:430 sm/gpgsm.c:262
+#: g10/gpg.c:430 sm/gpgsm.c:264
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
 #: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1634,35 +1645,35 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:279
+#: g10/gpg.c:434 sm/gpgsm.c:281
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:436 sm/gpgsm.c:291
+#: g10/gpg.c:436 sm/gpgsm.c:293
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/gpg.c:447 sm/gpgsm.c:327
+#: g10/gpg.c:447 sm/gpgsm.c:331
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usu�rio para\n"
 "assinar ou descriptografar"
 
-#: g10/gpg.c:448 sm/gpgsm.c:330
+#: g10/gpg.c:448 sm/gpgsm.c:334
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desabilita)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:332
+#: g10/gpg.c:453 sm/gpgsm.c:336
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "usar como arquivo de sa�da"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
@@ -1678,13 +1689,13 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:393
+#: g10/gpg.c:553 sm/gpgsm.c:397
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:556 sm/gpgsm.c:396
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1722,7 +1733,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:532
+#: g10/gpg.c:781 sm/gpgsm.c:538
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1751,7 +1762,7 @@ msgstr "Coment�rio: "
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:669
+#: g10/gpg.c:1045 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
@@ -1827,472 +1838,472 @@ msgstr "%s: novo arquivo de op��es criado\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1554
+#: 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:1556
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1562
+#: 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:1564
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1827
+#: g10/gpg.c:1825
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1981
 #, 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:2243 g10/gpg.c:2884 g10/gpg.c:2896
+#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2401 g10/gpg.c:2413
+#: g10/gpg.c:2399 g10/gpg.c:2411
 #, 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:2495
+#: g10/gpg.c:2493
 #, 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:2518 g10/gpg.c:2713 g10/keyedit.c:4084
+#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2528
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2531
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2538
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2541
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2548
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2551
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2558
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2561
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2569
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2571
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2573
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2575
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2579
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2581
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2585
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2587
 #, 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
+#: g10/gpg.c:2589
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2591
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2598
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2608
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2782
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2787
+#: g10/gpg.c:2785
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2873 sm/gpgsm.c:1220
+#: g10/gpg.c:2871 sm/gpgsm.c:1247
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2875
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2884
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2887
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2902
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/gpg.c:2918
+#: g10/gpg.c:2916
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2922
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2930
+#: g10/gpg.c:2928
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2943
+#: g10/gpg.c:2941
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
+#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1303
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
+#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1311
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3025
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3040
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3042
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3044
 #, 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:3048
+#: g10/gpg.c:3046
 #, 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:3050
+#: g10/gpg.c:3048
 #, 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:3053
+#: g10/gpg.c:3051
 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:3057
+#: g10/gpg.c:3055
 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:3064
+#: g10/gpg.c:3062
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3071
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3075
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3079
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3114
+#: g10/gpg.c:3112
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3159
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3164
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3171
+#: g10/gpg.c:3169
 #, 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:3263
+#: g10/gpg.c:3261
 #, 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:3274
+#: g10/gpg.c:3272
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3295
+#: g10/gpg.c:3293
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3300
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3302
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3312
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3325
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3327
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3332
+#: g10/gpg.c:3330
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3348
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3361
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3376
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3378
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3381
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3401
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3410
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3435
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3443
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3447
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3468
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3553
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3555
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3557
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3568
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/gpg.c:3580
+#: g10/gpg.c:3578
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3631
+#: g10/gpg.c:3629
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3639
+#: g10/gpg.c:3637
 #, 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:3729
+#: g10/gpg.c:3727
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3844
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/gpg.c:3850
+#: g10/gpg.c:3848
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4160
 #, 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:4162
 #, 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:4195
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
@@ -2307,7 +2318,7 @@ msgstr "Deletar esta chave do chaveiro? "
 msgid "make timestamp conflicts only a warning"
 msgstr "conflito de \"timestamp\""
 
-#: g10/gpgv.c:75 sm/gpgsm.c:368
+#: g10/gpgv.c:75 sm/gpgsm.c:372
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DA|escrever informa��es de estado para o\n"
@@ -6691,64 +6702,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: scd/scdaemon.c:105
+#: scd/scdaemon.c:108
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:357
+#: scd/scdaemon.c:114 sm/gpgsm.c:361
 #, fuzzy
 msgid "read options from file"
 msgstr "lendo op��es de `%s'\n"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:124
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:129
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "nunca usar o terminal"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:134
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:135
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "comandos conflitantes\n"
 
-#: scd/scdaemon.c:206
+#: scd/scdaemon.c:209
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: gpgm [op��es] [arquivos] (-h para ajuda)"
 
-#: scd/scdaemon.c:208
+#: scd/scdaemon.c:211
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:671
+#: scd/scdaemon.c:658
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1019
+#: scd/scdaemon.c:1006
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1024
+#: scd/scdaemon.c:1011
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6776,152 +6787,269 @@ msgstr "algoritmo de prote��o %d n�o � suportado\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:174
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr ""
+
+#: sm/certchain.c:195
+msgid "chain"
+msgstr ""
+
+#: sm/certchain.c:196
+#, fuzzy
+msgid "shell"
+msgstr "help"
+
+#: sm/certchain.c:241
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: sm/certchain.c:212
+#: sm/certchain.c:279
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:250
+#: sm/certchain.c:317
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:260
+#: sm/certchain.c:327
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/certchain.c:267 sm/certchain.c:296
+#: sm/certchain.c:334 sm/certchain.c:363
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:271 sm/certchain.c:300
+#: sm/certchain.c:338 sm/certchain.c:367
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: sm/certchain.c:411
+#: sm/certchain.c:478
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:431
+#: sm/certchain.c:498
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: sm/certchain.c:675
+#: sm/certchain.c:742
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "chave %08lX: a chave foi revogada!\n"
 
-#: sm/certchain.c:684
+#: sm/certchain.c:752
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Certificado correto"
 
-#: sm/certchain.c:688
+#: sm/certchain.c:757
+msgid "the status of the certificate is unknown"
+msgstr ""
+
+#: sm/certchain.c:762
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: sm/certchain.c:690
+#: sm/certchain.c:764
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:695
+#: sm/certchain.c:770
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "leitura de registro de assinatura falhou: %s\n"
 
-#: sm/certchain.c:791
-#, fuzzy
-msgid "no issuer found in certificate"
-msgstr "Certificado correto"
-
-#: sm/certchain.c:820
+#: sm/certchain.c:799 sm/certchain.c:867
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "erro de leitura do certificado: %s\n"
 
-#: sm/certchain.c:836
+#: sm/certchain.c:814 sm/certchain.c:899
 #, fuzzy
 msgid "certificate not yet valid"
 msgstr "Certificado de revoga��o v�lido"
 
-#: sm/certchain.c:849
+#: sm/certchain.c:815 sm/certchain.c:900
+#, fuzzy
+msgid "root certificate not yet valid"
+msgstr "Certificado de revoga��o v�lido"
+
+#: sm/certchain.c:816 sm/certchain.c:901
+#, fuzzy
+msgid "intermediate certificate not yet valid"
+msgstr "Certificado de revoga��o v�lido"
+
+#: sm/certchain.c:829
 #, fuzzy
 msgid "certificate has expired"
 msgstr "erro de leitura do certificado: %s\n"
 
-#: sm/certchain.c:892
-msgid "self-signed certificate has a BAD signature"
+#: sm/certchain.c:830
+#, fuzzy
+msgid "root certificate has expired"
+msgstr "erro de leitura do certificado: %s\n"
+
+#: sm/certchain.c:831
+#, fuzzy
+msgid "intermediate certificate has expired"
+msgstr "erro de leitura do certificado: %s\n"
+
+#: sm/certchain.c:873
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:960
+#: sm/certchain.c:882
 #, fuzzy
-msgid "root certificate is not marked trusted"
+msgid "certificate with invalid validity"
+msgstr "erro de leitura do certificado: %s\n"
+
+#: sm/certchain.c:919
+msgid "signature not created during lifetime of certificate"
 msgstr ""
-"Nenhum certificado com confian�a indefinida encontrado.\n"
-"\n"
 
-#: sm/certchain.c:975
+#: sm/certchain.c:921
+msgid "certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:922
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:926
+#, fuzzy
+msgid "  (  signature created at "
+msgstr "        novas assinaturas: %lu\n"
+
+#: sm/certchain.c:927
+#, fuzzy
+msgid "  (certificate created at "
+msgstr "chave %08lX: certificado de revoga��o adicionado\n"
+
+#: sm/certchain.c:930
+#, fuzzy
+msgid "  (certificate valid from "
+msgstr "Certificado de revoga��o v�lido"
+
+#: sm/certchain.c:931
+msgid "  (     issuer valid from "
+msgstr ""
+
+#: sm/certchain.c:961
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Impress�o digital:"
 
-#: sm/certchain.c:983
+#: sm/certchain.c:970
 #, fuzzy
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 "Nenhum certificado com confian�a indefinida encontrado.\n"
 "\n"
 
-#: sm/certchain.c:998
+#: sm/certchain.c:983
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1004
+#: sm/certchain.c:989
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1046
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr ""
+
+#: sm/certchain.c:1110
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "Certificado correto"
+
+#: sm/certchain.c:1184
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:1253
+#, fuzzy
+msgid "root certificate is not marked trusted"
+msgstr ""
+"Nenhum certificado com confian�a indefinida encontrado.\n"
+"\n"
+
+#: sm/certchain.c:1266
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "leitura de registro de assinatura falhou: %s\n"
 
-#: sm/certchain.c:1041 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:157
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Certificado de revoga��o v�lido"
 
-#: sm/certchain.c:1053
+#: sm/certchain.c:1307
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Certificado de revoga��o v�lido"
 
-#: sm/certchain.c:1086
+#: sm/certchain.c:1340
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verificar uma assinatura"
 
-#: sm/certchain.c:1116
+#: sm/certchain.c:1371
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1167
+#: sm/certchain.c:1422
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
+#: sm/certchain.c:1462 sm/certchain.c:1730
+#, fuzzy
+msgid "certificate is good\n"
+msgstr "Certificado de revoga��o v�lido"
+
+#: sm/certchain.c:1463
+#, fuzzy
+msgid "intermediate certificate is good\n"
+msgstr "certificado duplicado - removido"
+
+#: sm/certchain.c:1464
+#, fuzzy
+msgid "root certificate is good\n"
+msgstr ""
+"Nenhum certificado com confian�a indefinida encontrado.\n"
+"\n"
+
+#: sm/certchain.c:1620
+msgid "switching to chain model"
+msgstr ""
+
+#: sm/certchain.c:1629
+#, c-format
+msgid "validation model used: %s"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "chain model"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "shell model"
+msgstr ""
+
 #: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
@@ -6969,7 +7097,7 @@ msgstr "erro: impress�o digital inv�lida\n"
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
 "\"%s\"\n"
-"S/N %s, ID %08lX, created %s"
+"S/N %s, ID 0x%08lX, created %s"
 msgstr ""
 "\n"
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
@@ -6980,7 +7108,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:131 sm/keylist.c:255
+#: sm/certlist.c:131 sm/keylist.c:258
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
@@ -7103,183 +7231,183 @@ msgstr "erro na cria��o da frase secreta: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "erro na escrita do chaveiro `%': %s\n"
 
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: sm/gpgsm.c:251
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list external keys"
 msgstr "listar as chaves secretas"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Certificado de revoga��o v�lido"
 
-#: sm/gpgsm.c:256
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificado correto"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:262
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificado correto"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:268
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muda a frase secreta"
 
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "criar sa�da com armadura ascii"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:287
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:296
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:302
+#: sm/gpgsm.c:304
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:305
+#: sm/gpgsm.c:309
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:312
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:315
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:319
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:323
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:325
 msgid "use the default key as default recipient"
 msgstr "usar a chave padr�o como destinat�rio padr�o"
 
-#: sm/gpgsm.c:338
+#: sm/gpgsm.c:342
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:346
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:347
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para criptografar"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:352
 msgid "batch mode: never ask"
 msgstr "modo n�o-interativo: nunca perguntar"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:353
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:354
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:356
 msgid "add this keyring to the list of keyrings"
 msgstr "adicionar este chaveiro � lista de chaveiros"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:357
 msgid "add this secret keyring to the list"
 msgstr "adicionar este chaveiro secreto � lista"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta padr�o"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:359
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:360
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:364
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:375
+#: sm/gpgsm.c:379
 msgid "|FILE|load extension module FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: sm/gpgsm.c:381
+#: sm/gpgsm.c:385
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:387
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:389
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: sm/gpgsm.c:522
+#: sm/gpgsm.c:528
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpgm [op��es] [arquivos] (-h para ajuda)"
 
-#: sm/gpgsm.c:525
+#: sm/gpgsm.c:531
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7290,31 +7418,36 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: sm/gpgsm.c:604
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "Uso: gpgm [op��es] "
 
-#: sm/gpgsm.c:685
+#: sm/gpgsm.c:691
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/gpgsm.c:1237
+#: sm/gpgsm.c:713
+#, fuzzy, c-format
+msgid "unknown validation model `%s'\n"
+msgstr "destinat�rio padr�o desconhecido `%s'\n"
+
+#: sm/gpgsm.c:1264
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1316
+#: sm/gpgsm.c:1344
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: sm/gpgsm.c:1334
+#: sm/gpgsm.c:1362
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/gpgsm.c:1529
+#: sm/gpgsm.c:1543
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7337,7 +7470,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:375
+#: sm/import.c:541 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -7421,7 +7554,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234
+#: sm/qualified.c:234 sm/verify.c:536
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7440,30 +7573,35 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "leitura de registro de assinatura falhou: %s\n"
 
-#: sm/verify.c:386
+#: sm/verify.c:388
 #, fuzzy
 msgid "Signature made "
 msgstr "Esta chave n�o � protegida.\n"
 
-#: sm/verify.c:390
+#: sm/verify.c:392
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:391
-#, c-format
-msgid " using certificate ID %08lX\n"
-msgstr ""
+#: sm/verify.c:393
+#, fuzzy, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: sm/verify.c:507
+#: sm/verify.c:514
 #, fuzzy
 msgid "Good signature from"
 msgstr "Assinatura correta de \""
 
-#: sm/verify.c:508
+#: sm/verify.c:515
 #, fuzzy
 msgid "                aka"
 msgstr "                   ou \""
 
+#: sm/verify.c:533
+#, fuzzy
+msgid "This is a qualified signature\n"
+msgstr "isto pode ser causado por falta de auto-assinatura\n"
+
 # INICIO MENU
 #: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
@@ -7501,135 +7639,140 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:315
+#: tools/gpg-connect-agent.c:314
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:323
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:382
+#: tools/gpg-connect-agent.c:381
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "linha muito longa\n"
 
-#: tools/gpg-connect-agent.c:386
+#: tools/gpg-connect-agent.c:385
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:458
+#: tools/gpg-connect-agent.c:457
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: tools/gpg-connect-agent.c:466
+#: tools/gpg-connect-agent.c:465
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: tools/gpg-connect-agent.c:474
+#: tools/gpg-connect-agent.c:473
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: tools/gpg-connect-agent.c:784
+#: tools/gpg-connect-agent.c:789
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:793
+#: tools/gpg-connect-agent.c:798
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
+#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
-#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
+#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "habilitar depura��o completa"
 
-#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
-#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:501
+#: tools/gpgconf-comp.c:492
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:505
+#: tools/gpgconf-comp.c:496
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:509
+#: tools/gpgconf-comp.c:500
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:510
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:638
+#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#, fuzzy
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NOME|criptografar para NOME"
+
+#: tools/gpgconf-comp.c:635
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:640
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: tools/gpgconf-comp.c:705
+#: tools/gpgconf-comp.c:708
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:749
+#: tools/gpgconf-comp.c:752
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:785
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:806
+#: tools/gpgconf-comp.c:809
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:814
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:848
+#: tools/gpgconf-comp.c:851
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2681
+#: tools/gpgconf-comp.c:2684
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8211,9 +8354,6 @@ msgstr "algoritmo de prote��o %d n�o � suportado\n"
 #~ msgid "q"
 #~ msgstr "q"
 
-#~ msgid "help"
-#~ msgstr "help"
-
 #~ msgid "list"
 #~ msgstr "list"
 
diff --git a/po/ro.po b/po/ro.po
index 02d1f0706..b34f9332d 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-07-05 18:01+0200\n"
+"POT-Creation-Date: 2007-08-10 15:49+0200\n"
 "PO-Revision-Date: 2005-05-31 22:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -23,13 +23,13 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "am e�uat s� stochez amprenta: %s\n"
 
-#: agent/call-pinentry.c:426
+#: agent/call-pinentry.c:436
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:429
+#: agent/call-pinentry.c:439
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -37,41 +37,41 @@ msgid ""
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: agent/call-pinentry.c:476
+#: agent/call-pinentry.c:486
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
+#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
 #, fuzzy
 msgid "PIN too long"
 msgstr "linie prea lung�"
 
-#: agent/call-pinentry.c:497
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "fraz�-parol� prea lung�\n"
 
-#: agent/call-pinentry.c:505
+#: agent/call-pinentry.c:515
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter invalid �n nume\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:520
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:522
+#: agent/call-pinentry.c:532
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorect"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:533
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "fraz�-parol� incorect�"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:569
 #, fuzzy
 msgid "Passphrase"
 msgstr "fraz�-parol� incorect�"
@@ -88,14 +88,14 @@ msgstr "algoritm rezumat %d nu este suportat\n"
 msgid "can't create `%s': %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
 #: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
-#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1796
+#: sm/gpgsm.c:1833 sm/gpgsm.c:1871 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nu pot deschide `%s': %s\n"
@@ -183,35 +183,46 @@ msgstr[1] ""
 msgid "Take this one anyway"
 msgstr "Folosi�i oricum aceast� cheie? (d/N) "
 
-#: agent/genkey.c:99
+#: agent/genkey.c:99 agent/genkey.c:114
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Introduce�i fraza-parol�\n"
 
-#: agent/genkey.c:144
+#: agent/genkey.c:107
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+
+#: agent/genkey.c:113
+msgid "Yes, protection is not needed"
+msgstr ""
+
+#: agent/genkey.c:158
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a v� proteja cheia secret�.\n"
 "\n"
 
-#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
+#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
 #: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:263
+#: agent/genkey.c:280
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -221,247 +232,247 @@ msgstr ""
 "Op�iuni:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:103
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
-#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
 #: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "locvace"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
-#: sm/gpgsm.c:337
+#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "fii oarecum mai t�cut"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:109
+#: agent/gpg-agent.c:118 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:119
+#: agent/gpg-agent.c:125 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:125
+#: agent/gpg-agent.c:126
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "caut� pentru chei pe un server de chei"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:129
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualizeaz� baza de date de �ncredere"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:145
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:206 sm/gpgsm.c:525 tools/gpg-connect-agent.c:124
 #: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Raporta�i bug-uri la <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:262
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
+#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
-#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:340 sm/gpgsm.c:772 sm/gpgsm.c:775 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
+#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:863
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOT�: nici un fi�ier op�iuni implicit `%s'\n"
 
-#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
-#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: scd/scdaemon.c:421 sm/gpgsm.c:867 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
+#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:874
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "citesc op�iuni din `%s'\n"
 
-#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "eroare la creearea `%s': %s\n"
 
-#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
-#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:921
+#: agent/gpg-agent.c:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
+#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:908
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
+#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
+#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
+#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
+#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "director `%s' creat\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1377
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) a e�uat �n %s: %s\n"
 
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1381
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: nu pot crea director: %s\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1497
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1519
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
+#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "actualizarea secretului a e�uat: %s\n"
 
-#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
+#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: s�rit�: %s\n"
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1752
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:751
+#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabila de mediu GPG_AGENT_INFO anormal�\n"
 
-#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
-#: tools/gpg-connect-agent.c:762
+#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent versiune protocol %d nu este suportat\n"
@@ -529,42 +540,42 @@ msgstr "eroare la crearea frazei-parol�: %s\n"
 msgid "cancelled\n"
 msgstr "anulat�"
 
-#: agent/trustlist.c:131 agent/trustlist.c:319
+#: agent/trustlist.c:132 agent/trustlist.c:322
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "eroare �n `%s': %s\n"
 
-#: agent/trustlist.c:146
+#: agent/trustlist.c:147
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: agent/trustlist.c:166 agent/trustlist.c:174
+#: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:180
+#: agent/trustlist.c:181
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "p�r�i ale cheii secrete nu sunt disponibile\n"
 
-#: agent/trustlist.c:215
+#: agent/trustlist.c:216
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "eroare citire �n `%s': %s\n"
 
-#: agent/trustlist.c:241 agent/trustlist.c:248
+#: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:280
+#: agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: agent/trustlist.c:381 agent/trustlist.c:420
+#: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -577,7 +588,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:496
+#: agent/trustlist.c:507
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -587,7 +598,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:505
+#: agent/trustlist.c:516
 msgid "Correct"
 msgstr ""
 
@@ -599,58 +610,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:525
+#: agent/trustlist.c:536
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 #, fuzzy
 msgid "Yes"
 msgstr "da"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:393
+#: common/exechelp.c:302 common/exechelp.c:390
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: common/exechelp.c:369 common/exechelp.c:426
+#: common/exechelp.c:366 common/exechelp.c:423
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "nu pot deschide fi�ierul: %s\n"
 
-#: common/exechelp.c:405 common/exechelp.c:635
+#: common/exechelp.c:402 common/exechelp.c:632
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: common/exechelp.c:461 common/exechelp.c:504
+#: common/exechelp.c:458 common/exechelp.c:501
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:469
+#: common/exechelp.c:466
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
 
-#: common/exechelp.c:475 common/exechelp.c:515
+#: common/exechelp.c:472 common/exechelp.c:512
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: common/exechelp.c:510
+#: common/exechelp.c:507
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:521
+#: common/exechelp.c:518
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "eroare la citire `%s': %s\n"
@@ -669,26 +680,26 @@ msgstr "[ID utilizator nu a fost g�sit]"
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: common/simple-pwquery.c:376
+#: common/simple-pwquery.c:373
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nu m� pot conecta la `%s': %s\n"
 
-#: common/simple-pwquery.c:387
+#: common/simple-pwquery.c:384
 msgid "communication problem with gpg-agent\n"
 msgstr "probleme de comunicare cu gpg-agent\n"
 
-#: common/simple-pwquery.c:397
+#: common/simple-pwquery.c:394
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
 
-#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+#: common/simple-pwquery.c:557 common/simple-pwquery.c:653
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "anulat� de utilizator\n"
 
-#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+#: common/simple-pwquery.c:572 common/simple-pwquery.c:659
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
@@ -867,7 +878,7 @@ msgstr "AVERTISMENT: am g�sit date de notare invalide\n"
 msgid "not human readable"
 msgstr "ilizibil"
 
-#: g10/card-util.c:62 g10/card-util.c:305
+#: g10/card-util.c:62 g10/card-util.c:308
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "cardul OpenPGP nu e disponibil: %s\n"
@@ -877,153 +888,153 @@ 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:75 g10/card-util.c:1391 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "nu pot face acest lucru �n modul batch\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
 #: g10/keygen.c:1644
 msgid "Your selection? "
 msgstr "Selec�ia d-voastr�? "
 
-#: g10/card-util.c:215 g10/card-util.c:265
+#: g10/card-util.c:218 g10/card-util.c:268
 msgid "[not set]"
 msgstr "[nesetat(�)]"
 
-#: g10/card-util.c:412
+#: g10/card-util.c:415
 msgid "male"
 msgstr "masculin"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "female"
 msgstr "feminin"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "unspecified"
 msgstr "nespecificat(�)"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "not forced"
 msgstr "nefor�at(�)"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "forced"
 msgstr "for�at(�)"
 
-#: g10/card-util.c:518
+#: g10/card-util.c:521
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Eroare: Deocamdat� sunt permise numai caractere ASCII.\n"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:523
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Eroare: Caracterul \"<\" nu poate fi folosit.\n"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:525
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Eroare: Spa�iile duble nu sunt permise.\n"
 
-#: g10/card-util.c:539
+#: g10/card-util.c:542
 msgid "Cardholder's surname: "
 msgstr "Numele de familie al proprietarului cardului: "
 
-#: g10/card-util.c:541
+#: g10/card-util.c:544
 msgid "Cardholder's given name: "
 msgstr "Prenumele proprietarului cardului: "
 
-#: g10/card-util.c:559
+#: g10/card-util.c:562
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Eroare: Nume combinat prea lung (limita este de %d caractere).\n"
 
-#: g10/card-util.c:580
+#: g10/card-util.c:583
 msgid "URL to retrieve public key: "
 msgstr "URL pentru a aduce cheia public�: "
 
-#: g10/card-util.c:588
+#: g10/card-util.c:591
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Eroare: URL prea lung (limita este de %d caractere).\n"
 
-#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
+#: g10/card-util.c:689 g10/card-util.c:758 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: g10/card-util.c:694
+#: g10/card-util.c:697
 msgid "Login data (account name): "
 msgstr "Date login (nume cont): "
 
-#: g10/card-util.c:704
+#: g10/card-util.c:707
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Eroare: datele de login prea lungi (limita este de %d caractere).\n"
 
-#: g10/card-util.c:763
+#: g10/card-util.c:766
 msgid "Private DO data: "
 msgstr "Date DO personale: "
 
-#: g10/card-util.c:773
+#: g10/card-util.c:776
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Eroare DO personal pre lung (limita este de %d caractere).\n"
 
-#: g10/card-util.c:793
+#: g10/card-util.c:796
 msgid "Language preferences: "
 msgstr "Preferin�e limb�: "
 
-#: g10/card-util.c:801
+#: g10/card-util.c:804
 msgid "Error: invalid length of preference string.\n"
 msgstr "Eroare: lungime invalid� pentru �ir preferin�e.\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:813
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Eroare: caractere invalide �n �ir preferin�e.\n"
 
-#: g10/card-util.c:831
+#: g10/card-util.c:834
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Sex ((M)asculin, (F)eminin sau spa�iu): "
 
-#: g10/card-util.c:845
+#: g10/card-util.c:848
 msgid "Error: invalid response.\n"
 msgstr "Eroare: r�spuns invalid.\n"
 
-#: g10/card-util.c:866
+#: g10/card-util.c:869
 msgid "CA fingerprint: "
 msgstr "Amprenta CA: "
 
-#: g10/card-util.c:889
+#: g10/card-util.c:892
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Eroare: amprent� formatat� invalid.\n"
 
-#: g10/card-util.c:937
+#: g10/card-util.c:940
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "opera�ia pe cheie nu e posibil�: %s\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:941
 msgid "not an OpenPGP card"
 msgstr "nu este un card OpenPGP"
 
-#: g10/card-util.c:947
+#: g10/card-util.c:950
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
 
-#: g10/card-util.c:1031
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr "�nlocuiesc cheia existent�? (d/N) "
 
-#: g10/card-util.c:1051 g10/card-util.c:1060
+#: g10/card-util.c:1054 g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Creez copie de rezerv� a cheii de cifrare �n afara cardului? (d/N) "
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1075
 msgid "Replace existing keys? (y/N) "
 msgstr "�nlocuiesc cheile existente? (d/N) "
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1084
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1034,120 +1045,120 @@ msgstr ""
 "   PIN = `%s'     PIN Admin = `%s'\n"
 "Ar trebui s� le schimba�i folosind comanda --change-pin\n"
 
-#: g10/card-util.c:1115
+#: g10/card-util.c:1118
 msgid "Please select the type of key to generate:\n"
 msgstr "V� rug�m selecta�i tipul de cheie de generat:\n"
 
-#: g10/card-util.c:1117 g10/card-util.c:1194
+#: g10/card-util.c:1120 g10/card-util.c:1197
 msgid "   (1) Signature key\n"
 msgstr "   (1) Cheie de semnare\n"
 
-#: g10/card-util.c:1118 g10/card-util.c:1196
+#: g10/card-util.c:1121 g10/card-util.c:1199
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Cheie de cifrare\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1198
+#: g10/card-util.c:1122 g10/card-util.c:1201
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cheie de autentificare\n"
 
-#: g10/card-util.c:1135 g10/card-util.c:1214 g10/keyedit.c:945
+#: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
 #: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Selec�ie invalid�.\n"
 
-#: g10/card-util.c:1191
+#: g10/card-util.c:1194
 msgid "Please select where to store the key:\n"
 msgstr "V� rug�m selecta�i unde s� fie stocat� cheia:\n"
 
-#: g10/card-util.c:1226
+#: g10/card-util.c:1229
 msgid "unknown key protection algorithm\n"
 msgstr "algoritm de protec�ie a cheii necunoscut\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1234
 msgid "secret parts of key are not available\n"
 msgstr "p�r�i secrete ale cheii nu sunt disponibile\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1239
 msgid "secret key already stored on a card\n"
 msgstr "cheia secret� deja stocat� pe un card\n"
 
-#: g10/card-util.c:1304 g10/keyedit.c:1362
+#: g10/card-util.c:1307 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "ie�i din acest meniu"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1309
 msgid "show admin commands"
 msgstr "arat� comenzi administrare"
 
-#: g10/card-util.c:1307 g10/keyedit.c:1365
+#: g10/card-util.c:1310 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "afi�eaz� acest mesaj"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1312
 msgid "list all available data"
 msgstr "afi�eaz� toate datele disponibile"
 
-#: g10/card-util.c:1312
+#: g10/card-util.c:1315
 msgid "change card holder's name"
 msgstr "schimb� numele purt�torului cardului"
 
-#: g10/card-util.c:1313
+#: g10/card-util.c:1316
 msgid "change URL to retrieve key"
 msgstr "schimb� URL-ul de unde s� fie adus� cheia"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1317
 msgid "fetch the key specified in the card URL"
 msgstr "adu cheia specificat� de URL-ul de pe card"
 
-#: g10/card-util.c:1315
+#: g10/card-util.c:1318
 msgid "change the login name"
 msgstr "schimb� numele de login"
 
-#: g10/card-util.c:1316
+#: g10/card-util.c:1319
 msgid "change the language preferences"
 msgstr "schimb� preferin�ele de limb�"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1320
 msgid "change card holder's sex"
 msgstr "schimb� sexul purt�torului cardului"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1321
 msgid "change a CA fingerprint"
 msgstr "schimb� o amprent� CA"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1322
 msgid "toggle the signature force PIN flag"
 msgstr "comut� fanionul PIN de for�are a semn�turii"
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1323
 msgid "generate new keys"
 msgstr "genereaz� noi chei"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1324
 msgid "menu to change or unblock the PIN"
 msgstr "meniu pentru a schimba sau debloca PIN-ul"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1325
 msgid "verify the PIN and list all data"
 msgstr "verific� PIN-ul �i listeaz� toate datele"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1634
+#: g10/card-util.c:1445 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Comand�> "
 
-#: g10/card-util.c:1480
+#: g10/card-util.c:1483
 msgid "Admin-only command\n"
 msgstr "Comand� numai-administrare\n"
 
-#: g10/card-util.c:1511
+#: g10/card-util.c:1514
 msgid "Admin commands are allowed\n"
 msgstr "Sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:1513
+#: g10/card-util.c:1516
 msgid "Admin commands are not allowed\n"
 msgstr "Nu sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:1587 g10/keyedit.c:2255
+#: g10/card-util.c:1590 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
 
@@ -1155,7 +1166,7 @@ msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output nu merge pentru aceast� comand�\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nu pot deschide `%s'\n"
@@ -1458,7 +1469,7 @@ msgstr "folosim subcheia %s �n loc de cheia primar� %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "cheia %s: cheie secret� f�r� cheie public� - s�rit�\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1474,27 +1485,27 @@ msgstr "|[fi�ier]|creaz� o semn�tur�"
 msgid "|[file]|make a clear text signature"
 msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
 
-#: g10/gpg.c:372 sm/gpgsm.c:244
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "creaz� o semn�tur� deta�at�"
 
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "cifreaz� datele"
 
-#: g10/gpg.c:375 sm/gpgsm.c:246
+#: g10/gpg.c:375 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "cifreaz� numai cu cifru simetric"
 
-#: g10/gpg.c:377 sm/gpgsm.c:247
+#: g10/gpg.c:377 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "decripteaz� datele (implicit)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:248
+#: g10/gpg.c:379 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "verific� o semn�tur�"
 
-#: g10/gpg.c:381 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "enumer� chei"
 
@@ -1506,11 +1517,11 @@ msgstr "enumer� chei �i semn�turi"
 msgid "list and check key signatures"
 msgstr "enumer� �i verific� semn�turile cheii"
 
-#: g10/gpg.c:385 sm/gpgsm.c:254
+#: g10/gpg.c:385 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "enumer� chei �i amprente"
 
-#: g10/gpg.c:386 sm/gpgsm.c:252
+#: g10/gpg.c:386 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "enumer� chei secrete"
 
@@ -1546,11 +1557,11 @@ msgstr "genereaz� un certificat de revocare"
 msgid "export keys"
 msgstr "export� chei"
 
-#: g10/gpg.c:397 sm/gpgsm.c:257
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "export� chei pentru un server de chei"
 
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "import� chei de la un server de chei"
 
@@ -1586,11 +1597,11 @@ msgstr "actualizeaz� baza de date de �ncredere"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
 
-#: g10/gpg.c:430 sm/gpgsm.c:262
+#: g10/gpg.c:430 sm/gpgsm.c:264
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
 #: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1601,31 +1612,31 @@ msgstr ""
 "Op�iuni:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:279
+#: g10/gpg.c:434 sm/gpgsm.c:281
 msgid "create ascii armored output"
 msgstr "creaz� ie�ire �n armur� ascii"
 
-#: g10/gpg.c:436 sm/gpgsm.c:291
+#: g10/gpg.c:436 sm/gpgsm.c:293
 msgid "|NAME|encrypt for NAME"
 msgstr "|NUME|cifrare pentru NUME"
 
-#: g10/gpg.c:447 sm/gpgsm.c:327
+#: g10/gpg.c:447 sm/gpgsm.c:331
 msgid "use this user-id to sign or decrypt"
 msgstr "folose�te acest id-utilizator pentru a semna sau decripta"
 
-#: g10/gpg.c:448 sm/gpgsm.c:330
+#: g10/gpg.c:448 sm/gpgsm.c:334
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|seteaz� nivel de compresie N (0 deactiveaz�)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:332
+#: g10/gpg.c:453 sm/gpgsm.c:336
 msgid "use canonical text mode"
 msgstr "folose�te modul text canonic"
 
-#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "folose�te ca fi�ier ie�ire"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "nu face nici o schimbare"
 
@@ -1641,7 +1652,7 @@ msgstr "folose�te comportament strict OpenPGP"
 msgid "generate PGP 2.x compatible messages"
 msgstr "genereaz� mesaje compatibile cu PGP 2.x"
 
-#: g10/gpg.c:553 sm/gpgsm.c:393
+#: g10/gpg.c:553 sm/gpgsm.c:397
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1649,7 +1660,7 @@ msgstr ""
 "@\n"
 "(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:396
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1687,7 +1698,7 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:532
+#: g10/gpg.c:781 sm/gpgsm.c:538
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1715,7 +1726,7 @@ msgstr "Compresie: "
 msgid "usage: gpg [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:669
+#: g10/gpg.c:1045 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "comenzi �n conflict\n"
 
@@ -1807,459 +1818,459 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: 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:1548
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1554
+#: 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:1556
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1562
+#: 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:1564
+#: 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:1827
+#: g10/gpg.c:1825
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1981
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
 
-#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
+#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
 
-#: g10/gpg.c:2401 g10/gpg.c:2413
+#: g10/gpg.c:2399 g10/gpg.c:2411
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2493
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nu este un set de carectere valid\n"
 
 #
-#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4084
+#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2528
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2531
 msgid "invalid keyserver options\n"
 msgstr "op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2538
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op�iuni import invalide\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2541
 msgid "invalid import options\n"
 msgstr "op�iuni import invalide\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2548
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op�iuni export invalide\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2551
 msgid "invalid export options\n"
 msgstr "op�iuni export invalide\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2558
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2561
 msgid "invalid list options\n"
 msgstr "op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2569
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2571
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2573
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2575
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2579
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2581
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2585
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2587
 #, 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
+#: g10/gpg.c:2589
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2591
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2598
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2601
 msgid "invalid verify options\n"
 msgstr "op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2608
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execu�ie ca %s\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2782
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2787
+#: g10/gpg.c:2785
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2873 sm/gpgsm.c:1220
+#: g10/gpg.c:2871 sm/gpgsm.c:1247
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2875
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2884
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2887
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2902
 #, 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:2918
+#: g10/gpg.c:2916
 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:2924
+#: g10/gpg.c:2922
 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:2930
+#: g10/gpg.c:2928
 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:2943
+#: g10/gpg.c:2941
 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:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
+#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1303
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
+#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1311
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm compresie selectat este invalid\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3025
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3040
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3042
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3044
 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:3048
+#: g10/gpg.c:3046
 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:3050
+#: g10/gpg.c:3048
 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:3053
+#: g10/gpg.c:3051
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
 
-#: g10/gpg.c:3057
+#: g10/gpg.c:3055
 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:3064
+#: g10/gpg.c:3062
 msgid "invalid default preferences\n"
 msgstr "preferin�e implicite invalide\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3071
 msgid "invalid personal cipher preferences\n"
 msgstr "preferin�e cifrare personale invalide\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3075
 msgid "invalid personal digest preferences\n"
 msgstr "preferin�e rezumat personale invalide\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3079
 msgid "invalid personal compress preferences\n"
 msgstr "preferin�e compresie personale invalide\n"
 
-#: g10/gpg.c:3114
+#: g10/gpg.c:3112
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge �nc� cu %s!\n"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3159
 #, 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:3166
+#: g10/gpg.c:3164
 #, 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:3171
+#: g10/gpg.c:3169
 #, 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:3263
+#: g10/gpg.c:3261
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3272
 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:3295
+#: g10/gpg.c:3293
 msgid "--store [filename]"
 msgstr "--store [nume_fi�ier]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3300
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3302
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "cifrarea simetric� a lui `%s' a e�uat: %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3312
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3325
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3327
 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:3332
+#: g10/gpg.c:3330
 #, 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:3350
+#: g10/gpg.c:3348
 msgid "--sign [filename]"
 msgstr "--sign [nume_fi�ier]"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3361
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3376
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3378
 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:3383
+#: g10/gpg.c:3381
 #, 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:3403
+#: g10/gpg.c:3401
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3410
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nume_fi�ier]"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3435
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3443
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizator"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3447
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizator"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3468
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizator [comenzi]"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3553
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recep�ie server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3557
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie e�uat: %s\n"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3568
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "c�utare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3580
+#: g10/gpg.c:3578
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3631
+#: g10/gpg.c:3629
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3639
+#: g10/gpg.c:3637
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3729
+#: g10/gpg.c:3727
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3844
 msgid "[filename]"
 msgstr "[nume_fi�ier]"
 
-#: g10/gpg.c:3850
+#: g10/gpg.c:3848
 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:4160
 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:4162
 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:4195
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
@@ -2271,7 +2282,7 @@ msgstr "ia cheile de pe acest inel de chei"
 msgid "make timestamp conflicts only a warning"
 msgstr "d� numai un avertisment la conflicte de timestamp"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:368
+#: g10/gpgv.c:75 sm/gpgsm.c:372
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrie informa�ii de stare �n acest FD"
 
@@ -6649,64 +6660,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
 
-#: scd/scdaemon.c:105
+#: scd/scdaemon.c:108
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:357
+#: scd/scdaemon.c:114 sm/gpgsm.c:361
 #, fuzzy
 msgid "read options from file"
 msgstr "citesc op�iuni din `%s'\n"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:124
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NUME|folose�te NUME ca destinatar implicit"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NUME|folose�te NUME ca destinatar implicit"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:129
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "nu folosi deloc terminalul"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:134
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:135
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "arat� comenzi administrare"
 
-#: scd/scdaemon.c:206
+#: scd/scdaemon.c:209
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: scd/scdaemon.c:208
+#: scd/scdaemon.c:211
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:671
+#: scd/scdaemon.c:658
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1019
+#: scd/scdaemon.c:1006
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1024
+#: scd/scdaemon.c:1011
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6735,143 +6746,258 @@ msgstr "gpg-agent versiune protocol %d nu este suportat\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:174
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr ""
+
+#: sm/certchain.c:195
+msgid "chain"
+msgstr ""
+
+#: sm/certchain.c:196
+#, fuzzy
+msgid "shell"
+msgstr "ajutor"
+
+#: sm/certchain.c:241
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agent versiune protocol %d nu este suportat\n"
 
-#: sm/certchain.c:212
+#: sm/certchain.c:279
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:250
+#: sm/certchain.c:317
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:260
+#: sm/certchain.c:327
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "Nu pot deschide `%s': %s\n"
 
-#: sm/certchain.c:267 sm/certchain.c:296
+#: sm/certchain.c:334 sm/certchain.c:363
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:271 sm/certchain.c:300
+#: sm/certchain.c:338 sm/certchain.c:367
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "exportul cheilor secrete nu este permis\n"
 
-#: sm/certchain.c:411
+#: sm/certchain.c:478
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:431
+#: sm/certchain.c:498
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "am e�uat s� stochez cheia: %s\n"
 
-#: sm/certchain.c:675
+#: sm/certchain.c:742
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOT�: cheia a fost revocat�"
 
-#: sm/certchain.c:684
+#: sm/certchain.c:752
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "certificat incorect"
 
-#: sm/certchain.c:688
+#: sm/certchain.c:757
+msgid "the status of the certificate is unknown"
+msgstr ""
+
+#: sm/certchain.c:762
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Cheie disponibil� la: "
 
-#: sm/certchain.c:690
+#: sm/certchain.c:764
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:695
+#: sm/certchain.c:770
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "verificarea semn�turii create a e�uat: %s\n"
 
-#: sm/certchain.c:791
-#, fuzzy
-msgid "no issuer found in certificate"
-msgstr "genereaz� un certificat de revocare"
-
-#: sm/certchain.c:820
+#: sm/certchain.c:799 sm/certchain.c:867
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:836
+#: sm/certchain.c:814 sm/certchain.c:899
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:849
+#: sm/certchain.c:815 sm/certchain.c:900
+#, fuzzy
+msgid "root certificate not yet valid"
+msgstr "exportul cheilor secrete nu este permis\n"
+
+#: sm/certchain.c:816 sm/certchain.c:901
+msgid "intermediate certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:829
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Aceast� cheie a expirat!"
 
-#: sm/certchain.c:892
-msgid "self-signed certificate has a BAD signature"
+#: sm/certchain.c:830
+#, fuzzy
+msgid "root certificate has expired"
+msgstr "Aceast� cheie a expirat!"
+
+#: sm/certchain.c:831
+#, fuzzy
+msgid "intermediate certificate has expired"
+msgstr "Aceast� cheie a expirat!"
+
+#: sm/certchain.c:873
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:960
-msgid "root certificate is not marked trusted"
+#: sm/certchain.c:882
+#, fuzzy
+msgid "certificate with invalid validity"
+msgstr "Aceast� cheie a expirat!"
+
+#: sm/certchain.c:919
+msgid "signature not created during lifetime of certificate"
+msgstr ""
+
+#: sm/certchain.c:921
+msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:975
+#: sm/certchain.c:922
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:926
+#, fuzzy
+msgid "  (  signature created at "
+msgstr "semn�turi create p�n� acum: %lu\n"
+
+#: sm/certchain.c:927
+#, fuzzy
+msgid "  (certificate created at "
+msgstr "Certificat de revocare creat.\n"
+
+#: sm/certchain.c:930
+#, fuzzy
+msgid "  (certificate valid from "
+msgstr "certificat incorect"
+
+#: sm/certchain.c:931
+#, fuzzy
+msgid "  (     issuer valid from "
+msgstr "      Card nr. serie ="
+
+#: sm/certchain.c:961
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Amprenta CA: "
 
-#: sm/certchain.c:983
+#: sm/certchain.c:970
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:998
+#: sm/certchain.c:983
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1004
+#: sm/certchain.c:989
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1046
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr ""
+
+#: sm/certchain.c:1110
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "genereaz� un certificat de revocare"
+
+#: sm/certchain.c:1184
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:1253
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:1266
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "verificarea semn�turii create a e�uat: %s\n"
 
-#: sm/certchain.c:1041 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1053
+#: sm/certchain.c:1307
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1086
+#: sm/certchain.c:1340
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verific� o semn�tur�"
 
-#: sm/certchain.c:1116
+#: sm/certchain.c:1371
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1167
+#: sm/certchain.c:1422
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
+#: sm/certchain.c:1462 sm/certchain.c:1730
+#, fuzzy
+msgid "certificate is good\n"
+msgstr "preferin�a `%s' duplicat�\n"
+
+#: sm/certchain.c:1463
+#, fuzzy
+msgid "intermediate certificate is good\n"
+msgstr "Certificat de revocare creat.\n"
+
+#: sm/certchain.c:1464
+#, fuzzy
+msgid "root certificate is good\n"
+msgstr "certificat incorect"
+
+#: sm/certchain.c:1620
+msgid "switching to chain model"
+msgstr ""
+
+#: sm/certchain.c:1629
+#, c-format
+msgid "validation model used: %s"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "chain model"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "shell model"
+msgstr ""
+
 #: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
@@ -6919,7 +7045,7 @@ msgstr "Eroare: r�spuns invalid.\n"
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
 "\"%s\"\n"
-"S/N %s, ID %08lX, created %s"
+"S/N %s, ID 0x%08lX, created %s"
 msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a descuia cheia secret� pt. "
 "utilizator:\n"
@@ -6930,7 +7056,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:131 sm/keylist.c:255
+#: sm/certlist.c:131 sm/keylist.c:258
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
@@ -7052,182 +7178,182 @@ msgstr "eroare la crearea frazei-parol�: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "%s: eroare scriere �nregistrare dir: %s\n"
 
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[fi�ier]|creaz� o semn�tur�"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
 
-#: sm/gpgsm.c:251
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list external keys"
 msgstr "enumer� chei secrete"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list certificate chain"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:256
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "�terge chei de pe inelul de chei public"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "import certificates"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:262
 #, fuzzy
 msgid "export certificates"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 #, fuzzy
 msgid "register a smartcard"
 msgstr "adaug� o cheie la un smartcard"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:268
 #, fuzzy
 msgid "change a passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "creaz� ie�ire �n armur� ascii"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:287
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:296
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:302
+#: sm/gpgsm.c:304
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:305
+#: sm/gpgsm.c:309
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:312
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:315
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:319
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:323
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NUME|folose�te NUME ca destinatar implicit"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:325
 msgid "use the default key as default recipient"
 msgstr "folose�te cheia implicit� ca destinatar implicit"
 
-#: sm/gpgsm.c:338
+#: sm/gpgsm.c:342
 msgid "don't use the terminal at all"
 msgstr "nu folosi deloc terminalul"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:346
 msgid "force v3 signatures"
 msgstr "for�eaz� semn�turi v3"
 
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:347
 msgid "always use a MDC for encryption"
 msgstr "folose�te �ntotdeauna un MDC pentru cifrare"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:352
 msgid "batch mode: never ask"
 msgstr "modul batch: nu �ntreba niciodat�"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:353
 msgid "assume yes on most questions"
 msgstr "presupune da la cele mai multe �ntreb�ri"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:354
 msgid "assume no on most questions"
 msgstr "presupune nu la cele mai multe �ntreb�ri"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:356
 msgid "add this keyring to the list of keyrings"
 msgstr "adaug� acest inel de chei la lista inelelor de chei"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:357
 msgid "add this secret keyring to the list"
 msgstr "adaug� acest inel de chei secret la list�"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NUME|folose�te NUME ca cheie secret� implicit�"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:359
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|folose�te acest server de chei pentru a c�uta chei"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:360
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NUME|seteaz� charset-ul pentru terminal ca NUME"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:364
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:375
+#: sm/gpgsm.c:379
 msgid "|FILE|load extension module FILE"
 msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
 
-#: sm/gpgsm.c:381
+#: sm/gpgsm.c:385
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NUME|folose�te algoritm cifrare NUME"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:387
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NUME|folose�te algoritm rezumat mesaj NUME"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:389
 msgid "|N|use compress algorithm N"
 msgstr "|N|folose�te algoritm compresie N"
 
-#: sm/gpgsm.c:522
+#: sm/gpgsm.c:528
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: sm/gpgsm.c:525
+#: sm/gpgsm.c:531
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7238,31 +7364,36 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: sm/gpgsm.c:604
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: sm/gpgsm.c:685
+#: sm/gpgsm.c:691
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "nu m� pot conecta la `%s': %s\n"
 
-#: sm/gpgsm.c:1237
+#: sm/gpgsm.c:713
+#, fuzzy, c-format
+msgid "unknown validation model `%s'\n"
+msgstr "op�iune necunoscut� `%s'\n"
+
+#: sm/gpgsm.c:1264
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1316
+#: sm/gpgsm.c:1344
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1334
+#: sm/gpgsm.c:1362
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nu pot accesa `%s': %s\n"
 
-#: sm/gpgsm.c:1529
+#: sm/gpgsm.c:1543
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7285,7 +7416,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "eroare la ob�inerea num�rului serial: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:375
+#: sm/import.c:541 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "eroare la citire `%s': %s\n"
@@ -7369,7 +7500,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234
+#: sm/qualified.c:234 sm/verify.c:536
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7388,30 +7519,35 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "verificarea semn�turii create a e�uat: %s\n"
 
-#: sm/verify.c:386
+#: sm/verify.c:388
 #, fuzzy
 msgid "Signature made "
 msgstr "Semn�tur� f�cut� %s\n"
 
-#: sm/verify.c:390
+#: sm/verify.c:392
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:391
-#, c-format
-msgid " using certificate ID %08lX\n"
-msgstr ""
+#: sm/verify.c:393
+#, fuzzy, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr "eroare la ob�inerea num�rului serial: %s\n"
 
-#: sm/verify.c:507
+#: sm/verify.c:514
 #, fuzzy
 msgid "Good signature from"
 msgstr "Semn�tur� bun� din \"%s\""
 
-#: sm/verify.c:508
+#: sm/verify.c:515
 #, fuzzy
 msgid "                aka"
 msgstr "                aka \"%s\""
 
+#: sm/verify.c:533
+#, fuzzy
+msgid "This is a qualified signature\n"
+msgstr "Aceasta va fi o auto-semn�tur�.\n"
+
 #: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
@@ -7448,132 +7584,137 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:315
+#: tools/gpg-connect-agent.c:314
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:323
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:382
+#: tools/gpg-connect-agent.c:381
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "linie prea lung�"
 
-#: tools/gpg-connect-agent.c:386
+#: tools/gpg-connect-agent.c:385
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:458
+#: tools/gpg-connect-agent.c:457
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "op�iune necunoscut� `%s'\n"
 
-#: tools/gpg-connect-agent.c:466
+#: tools/gpg-connect-agent.c:465
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "semnarea a e�uat: %s\n"
 
-#: tools/gpg-connect-agent.c:474
+#: tools/gpg-connect-agent.c:473
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "citirea cheii publice a e�uat: %s\n"
 
-#: tools/gpg-connect-agent.c:784
+#: tools/gpg-connect-agent.c:789
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:793
+#: tools/gpg-connect-agent.c:798
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
+#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
-#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
+#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
-#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:501
+#: tools/gpgconf-comp.c:492
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:505
+#: tools/gpgconf-comp.c:496
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:509
+#: tools/gpgconf-comp.c:500
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:510
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:638
+#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#, fuzzy
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NUME|cifrare pentru NUME"
+
+#: tools/gpgconf-comp.c:635
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:640
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NUME|folose�te algoritm cifrare NUME pentru fraza-parol�"
 
-#: tools/gpgconf-comp.c:705
+#: tools/gpgconf-comp.c:708
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:749
+#: tools/gpgconf-comp.c:752
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:785
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:806
+#: tools/gpgconf-comp.c:809
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:814
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:848
+#: tools/gpgconf-comp.c:851
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2681
+#: tools/gpgconf-comp.c:2684
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8383,9 +8524,6 @@ msgstr "algoritm rezumat %d nu este suportat\n"
 #~ msgid "save"
 #~ msgstr "salveaz�"
 
-#~ msgid "help"
-#~ msgstr "ajutor"
-
 #~ msgid "fpr"
 #~ msgstr "ampr"
 
diff --git a/po/ru.po b/po/ru.po
index 332db52a8..94efe9000 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 2.0.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-07-05 18:01+0200\n"
+"POT-Creation-Date: 2007-08-10 15:49+0200\n"
 "PO-Revision-Date: 2006-11-07 19:31+0300\n"
 "Last-Translator: Maxim Britov <maxim.britov@gmail.com>\n"
 "Language-Team: Russian <gnupg-ru@gnupg.org>\n"
@@ -21,48 +21,48 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr ""
 
-#: agent/call-pinentry.c:426
+#: agent/call-pinentry.c:436
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr "Введите PIN-код для получения доступа к закрытому ключу"
 
-#: agent/call-pinentry.c:429
+#: agent/call-pinentry.c:439
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Введите фразу-пароль для доступа к закрытому ключу"
 
-#: agent/call-pinentry.c:476
+#: agent/call-pinentry.c:486
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
+#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
 msgid "PIN too long"
 msgstr "PIN слишком длинен"
 
-#: agent/call-pinentry.c:497
+#: agent/call-pinentry.c:507
 msgid "Passphrase too long"
 msgstr "фраза-пароль слишком длинная"
 
-#: agent/call-pinentry.c:505
+#: agent/call-pinentry.c:515
 msgid "Invalid characters in PIN"
 msgstr "Недопустимый символ в PIN-коде"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:520
 msgid "PIN too short"
 msgstr "PIN-код слишком короткий"
 
-#: agent/call-pinentry.c:522
+#: agent/call-pinentry.c:532
 msgid "Bad PIN"
 msgstr "плохой PIN"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:533
 msgid "Bad Passphrase"
 msgstr "Неверная фраза-пароль"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:569
 msgid "Passphrase"
 msgstr "Фраза-пароль"
 
@@ -78,14 +78,14 @@ msgstr "не поддерживаются ssh ключи превышающие
 msgid "can't create `%s': %s\n"
 msgstr "не могу создать `%s': %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
 #: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
-#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1796
+#: sm/gpgsm.c:1833 sm/gpgsm.c:1871 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "не могу открыть `%s': %s\n"
@@ -172,31 +172,42 @@ msgstr[1] ""
 msgid "Take this one anyway"
 msgstr "Всё равно использовать данный ключ? (y/N)"
 
-#: agent/genkey.c:99
+#: agent/genkey.c:99 agent/genkey.c:114
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Введите фразу-пароль\n"
 
-#: agent/genkey.c:144
+#: agent/genkey.c:107
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+
+#: agent/genkey.c:113
+msgid "Yes, protection is not needed"
+msgstr ""
+
+#: agent/genkey.c:158
 #, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr "Введите фразу-пароль%0Aдля защиты нового ключа"
 
-#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
+#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
 msgid "Please re-enter this passphrase"
 msgstr "Повторно введите фразу-пароль:"
 
-#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
 #: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr "не совпало, попробуйте еще раз"
 
-#: agent/genkey.c:263
+#: agent/genkey.c:280
 msgid "Please enter the new passphrase"
 msgstr "Введите новую фразу-пароль"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:104
 msgid ""
 "@Options:\n"
 " "
@@ -204,109 +215,109 @@ msgstr ""
 "@Параметры:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:103
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr "запуск в режиме сервера (foreground)"
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr "запуск в режиме демона (background)"
 
-#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
-#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
 #: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "подробно"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
-#: sm/gpgsm.c:337
+#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "уменьшить количество выводимой информации"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:109
+#: agent/gpg-agent.c:118 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr "вывод результатов в sh-стиле"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr "вывод результатов в csh-стиле"
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|взять параметры из FILE"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:119
+#: agent/gpg-agent.c:125 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr "не отсоединяться от консоли"
 
-#: agent/gpg-agent.c:125
+#: agent/gpg-agent.c:126
 msgid "do not grab keyboard and mouse"
 msgstr "не перехватывать события мыши и клавиатуры"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "использовать файл журнала для сервера"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:129
 msgid "use a standard location for the socket"
 msgstr "стандартное расположение сокета"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|использовать PGM как PIN-Entry"
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM| использовать PGM как SCdaemon"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 msgid "do not use the SCdaemon"
 msgstr "не использовать SCdaemon"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "ignore requests to change the TTY"
 msgstr "игнорировать запросы смены TTY"
 
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:145
 msgid "ignore requests to change the X display"
 msgstr "игнорировать запросы смены X дисплея"
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|кеш PIN просрочен после N секунд"
 
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr "не использовать кеш PIN при подписывании"
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "позволить клиентам помечать ключи как \"доверяемые\""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:158
 msgid "allow presetting passphrase"
 msgstr "разрешить предустановленную фразу-пароль"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr "разрешить эмуляцию ssh-агента"
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|FILE|сохранить состояние в файл"
 
-#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:206 sm/gpgsm.c:525 tools/gpg-connect-agent.c:124
 #: tools/gpgconf.c:89 tools/symcryptrun.c:204
 msgid "Please report bugs to <"
 msgstr "О найденных ошибках сообщайте <"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:260
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Использование: gpg-agent [параметры] (-h для подсказки)"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:262
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -314,131 +325,131 @@ msgstr ""
 "Синтаксис: gpg-agent [параметры] [команда [аргументы]]\n"
 "Управление закрытыми ключами для GnuPG\n"
 
-#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
+#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "запрошен недупустимый уровень отладки `%s'\n"
 
-#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
-#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:340 sm/gpgsm.c:772 sm/gpgsm.c:775 tools/symcryptrun.c:1026
 #, fuzzy, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "libksba слишком устаревшая (требуется %s, имеется %s)\n"
 
-#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
+#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:863
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
 
-#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
-#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: scd/scdaemon.c:421 sm/gpgsm.c:867 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл конфигурации `%s': %s\n"
 
-#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
+#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:874
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "параметры конфигурации из файла `%s'\n"
 
-#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "ошибка создания `%s': %s\n"
 
-#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
-#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:921
+#: agent/gpg-agent.c:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
+#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:908
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "не могу создать каталог `%s': %s\n"
 
-#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
+#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr "имя сокета слишком длинное\n"
 
-#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "не могу создать сокет: %s\n"
 
-#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "нет gpg-agent доступого для данной сессии\n"
 
-#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
+#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "ошибка связывния сокета с `%s': %s\n"
 
-#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
+#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "слушаем сокет `%s'\n"
 
-#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
+#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "создан каталог `%s'\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1377
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1381
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "невозможно использовать `%s' как домашний каталог\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1497
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1519
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
+#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
+#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s: остановлен\n"
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1752
 msgid "no gpg-agent running in this session\n"
 msgstr "нет gpg-agent доступого для данной сессии\n"
 
-#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:751
+#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "неправильная переменная окружения GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
-#: tools/gpg-connect-agent.c:762
+#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "протокол gpg-agent версии %d не поддерживается\n"
@@ -504,42 +515,42 @@ msgstr "ошибка запроса ввода фразы-пароля: %s\n"
 msgid "cancelled\n"
 msgstr "отменено\n"
 
-#: agent/trustlist.c:131 agent/trustlist.c:319
+#: agent/trustlist.c:132 agent/trustlist.c:322
 #, c-format
 msgid "error opening `%s': %s\n"
 msgstr "ошибка открытия `%s': %s\n"
 
-#: agent/trustlist.c:146
+#: agent/trustlist.c:147
 #, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "файл `%s', строка %d: %s\n"
 
-#: agent/trustlist.c:166 agent/trustlist.c:174
+#: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:180
+#: agent/trustlist.c:181
 #, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "системный список доверий `%s' не доступен\n"
 
-#: agent/trustlist.c:215
+#: agent/trustlist.c:216
 #, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "недопустимый отпечаток в `%s', строка %d\n"
 
-#: agent/trustlist.c:241 agent/trustlist.c:248
+#: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:280
+#: agent/trustlist.c:283
 #, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "ошибка чтения `%s', строка %d: %s\n"
 
-#: agent/trustlist.c:381 agent/trustlist.c:420
+#: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
 msgstr "ошибка чтения списка доверяемых корневых сертификатов\n"
 
@@ -552,7 +563,7 @@ msgstr "ошибка чтения списка доверяемых корнев
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:496
+#: agent/trustlist.c:507
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -564,7 +575,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:505
+#: agent/trustlist.c:516
 msgid "Correct"
 msgstr "Подтверждаю"
 
@@ -576,7 +587,7 @@ msgstr "Подтверждаю"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:525
+#: agent/trustlist.c:536
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -585,50 +596,50 @@ msgstr ""
 "Действительно абсолютно доверять%%0A  \"%s\"%%0Aкорректно подписанным "
 "сертификатам пользователя?"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "Yes"
 msgstr "Да"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "No"
 msgstr "Нет"
 
-#: common/exechelp.c:302 common/exechelp.c:393
+#: common/exechelp.c:302 common/exechelp.c:390
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr ""
 
-#: common/exechelp.c:369 common/exechelp.c:426
+#: common/exechelp.c:366 common/exechelp.c:423
 #, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr ""
 
-#: common/exechelp.c:405 common/exechelp.c:635
+#: common/exechelp.c:402 common/exechelp.c:632
 #, c-format
 msgid "error forking process: %s\n"
 msgstr ""
 
-#: common/exechelp.c:461 common/exechelp.c:504
+#: common/exechelp.c:458 common/exechelp.c:501
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:469
+#: common/exechelp.c:466
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "ошибка получения кода возврата процесса %d: %s\n"
 
-#: common/exechelp.c:475 common/exechelp.c:515
+#: common/exechelp.c:472 common/exechelp.c:512
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "ошибка чтения `%s': статус завершения %d\n"
 
-#: common/exechelp.c:510
+#: common/exechelp.c:507
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr "ошибка запуска `%s': позможно не установлен\n"
 
-#: common/exechelp.c:521
+#: common/exechelp.c:518
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "ошибка чтения `%s': прервано\n"
@@ -646,24 +657,24 @@ msgstr "хост не найден"
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent недоступен в данной сессии\n"
 
-#: common/simple-pwquery.c:376
+#: common/simple-pwquery.c:373
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "не могу подключиться к `%s': %s\n"
 
-#: common/simple-pwquery.c:387
+#: common/simple-pwquery.c:384
 msgid "communication problem with gpg-agent\n"
 msgstr "проблема связи с gpg-agent\n"
 
-#: common/simple-pwquery.c:397
+#: common/simple-pwquery.c:394
 msgid "problem setting the gpg-agent options\n"
 msgstr "проблема задания параметров gpg-agent\n"
 
-#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+#: common/simple-pwquery.c:557 common/simple-pwquery.c:653
 msgid "canceled by user\n"
 msgstr "прервано пользователем\n"
 
-#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+#: common/simple-pwquery.c:572 common/simple-pwquery.c:659
 msgid "problem with the agent\n"
 msgstr "проблема с агентом\n"
 
@@ -840,7 +851,7 @@ msgstr "ВНИМАНИЕ: обнаружено недопустимое прим
 msgid "not human readable"
 msgstr "не читаемое человеком"
 
-#: g10/card-util.c:62 g10/card-util.c:305
+#: g10/card-util.c:62 g10/card-util.c:308
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "Карта OpenPGP недоступна: %s\n"
@@ -850,153 +861,153 @@ msgstr "Карта OpenPGP недоступна: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Обнаружена карта OpenPGP номер %s \n"
 
-#: g10/card-util.c:75 g10/card-util.c:1391 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "невозможно сделать это в пакетном режиме\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
 #: g10/keygen.c:1644
 msgid "Your selection? "
 msgstr "Ваш выбор (?-подробнее)? "
 
-#: g10/card-util.c:215 g10/card-util.c:265
+#: g10/card-util.c:218 g10/card-util.c:268
 msgid "[not set]"
 msgstr "[не установлено]"
 
-#: g10/card-util.c:412
+#: g10/card-util.c:415
 msgid "male"
 msgstr "мужской"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "female"
 msgstr "женский"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "unspecified"
 msgstr "не задан"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "not forced"
 msgstr ""
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:521
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Ошибка: Допустим только чистый ASCII.\n"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:523
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Ошибка: Нельзя использовать символ \"<\"\n"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:525
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Ошибка: Двойные пробелы недопустимы.\n"
 
-#: g10/card-util.c:539
+#: g10/card-util.c:542
 msgid "Cardholder's surname: "
 msgstr "Фамилия владельца карты:"
 
-#: g10/card-util.c:541
+#: g10/card-util.c:544
 msgid "Cardholder's given name: "
 msgstr "Имя владельца карты:"
 
-#: g10/card-util.c:559
+#: g10/card-util.c:562
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Ошибка: Скомбинированное имя слишком длинное (предел %d символов).\n"
 
-#: g10/card-util.c:580
+#: g10/card-util.c:583
 msgid "URL to retrieve public key: "
 msgstr "URL для получения открытого ключа: "
 
-#: g10/card-util.c:588
+#: g10/card-util.c:591
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Ошибка: URL слишком длинный (предел - %d символов).\n"
 
-#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
+#: g10/card-util.c:689 g10/card-util.c:758 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "ошибка чтения `%s': %s\n"
 
-#: g10/card-util.c:694
+#: g10/card-util.c:697
 msgid "Login data (account name): "
 msgstr "Учетная запись (имя):"
 
-#: g10/card-util.c:704
+#: g10/card-util.c:707
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Ошибка: Данные учетной записи слишком длинные (предел %d символов).\n"
 
-#: g10/card-util.c:763
+#: g10/card-util.c:766
 msgid "Private DO data: "
 msgstr "Секретные DO данные:"
 
-#: g10/card-util.c:773
+#: g10/card-util.c:776
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Ошибка: Секретные DO данные слишком длинные (предел %d символов).\n"
 
-#: g10/card-util.c:793
+#: g10/card-util.c:796
 msgid "Language preferences: "
 msgstr "Предпочитаемый язык: "
 
-#: g10/card-util.c:801
+#: g10/card-util.c:804
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ошибка: недопустимая длина строки предпочтений.\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:813
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ошибка: недопустимые символы в строке предпочтений.\n"
 
-#: g10/card-util.c:831
+#: g10/card-util.c:834
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Пол ((M)Мужской, (F)Женский или пробел): "
 
-#: g10/card-util.c:845
+#: g10/card-util.c:848
 msgid "Error: invalid response.\n"
 msgstr "Ошибка: недопустимый ответ.\n"
 
-#: g10/card-util.c:866
+#: g10/card-util.c:869
 msgid "CA fingerprint: "
 msgstr "отпечаток CA: "
 
-#: g10/card-util.c:889
+#: g10/card-util.c:892
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Ошибка: неправильный формат отпечатка.\n"
 
-#: g10/card-util.c:937
+#: g10/card-util.c:940
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "операция с ключом невозможна: %s\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:941
 msgid "not an OpenPGP card"
 msgstr "карта не OpenPGP"
 
-#: g10/card-util.c:947
+#: g10/card-util.c:950
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "ошибка при считывании информации ключа: %s\n"
 
-#: g10/card-util.c:1031
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr "Заменить существующий ключ? (y/N) "
 
-#: g10/card-util.c:1051 g10/card-util.c:1060
+#: g10/card-util.c:1054 g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Сделать резервную копию ключа шифрования вне карты? (Y/n)"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1075
 msgid "Replace existing keys? (y/N) "
 msgstr "Заменить существующие ключи? (y/N) "
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1084
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1007,120 +1018,120 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "Следует изменить их используя команду --change-pin\n"
 
-#: g10/card-util.c:1115
+#: g10/card-util.c:1118
 msgid "Please select the type of key to generate:\n"
 msgstr "Выберите тип создаваемого ключа:\n"
 
-#: g10/card-util.c:1117 g10/card-util.c:1194
+#: g10/card-util.c:1120 g10/card-util.c:1197
 msgid "   (1) Signature key\n"
 msgstr "   (1) Ключ подписи\n"
 
-#: g10/card-util.c:1118 g10/card-util.c:1196
+#: g10/card-util.c:1121 g10/card-util.c:1199
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Ключ шифрования\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1198
+#: g10/card-util.c:1122 g10/card-util.c:1201
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Ключ аутентификации\n"
 
-#: g10/card-util.c:1135 g10/card-util.c:1214 g10/keyedit.c:945
+#: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
 #: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Неправильный выбор.\n"
 
-#: g10/card-util.c:1191
+#: g10/card-util.c:1194
 msgid "Please select where to store the key:\n"
 msgstr "Выберите, где сохранить ключ:\n"
 
-#: g10/card-util.c:1226
+#: g10/card-util.c:1229
 msgid "unknown key protection algorithm\n"
 msgstr "неизвестный алгоритм защиты ключа\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1234
 msgid "secret parts of key are not available\n"
 msgstr "секретные части ключа недоступны\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1239
 msgid "secret key already stored on a card\n"
 msgstr "секретный ключ уже сохранен в карте\n"
 
-#: g10/card-util.c:1304 g10/keyedit.c:1362
+#: g10/card-util.c:1307 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "выйти из этого меню"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1309
 msgid "show admin commands"
 msgstr "показать управляющие команды"
 
-#: g10/card-util.c:1307 g10/keyedit.c:1365
+#: g10/card-util.c:1310 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "показать данную справку"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1312
 msgid "list all available data"
 msgstr "вывести все доступные данные"
 
-#: g10/card-util.c:1312
+#: g10/card-util.c:1315
 msgid "change card holder's name"
 msgstr "изменить имя владельца карты"
 
-#: g10/card-util.c:1313
+#: g10/card-util.c:1316
 msgid "change URL to retrieve key"
 msgstr "изменить URL получения ключа"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1317
 msgid "fetch the key specified in the card URL"
 msgstr "запросить ключ, указанный по заданному картой URL"
 
-#: g10/card-util.c:1315
+#: g10/card-util.c:1318
 msgid "change the login name"
 msgstr "изменить учетное имя"
 
-#: g10/card-util.c:1316
+#: g10/card-util.c:1319
 msgid "change the language preferences"
 msgstr "изменить языковые предпочтения"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1320
 msgid "change card holder's sex"
 msgstr "изменение пола владельца карты"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1321
 msgid "change a CA fingerprint"
 msgstr "сменить отпечаток CA"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1322
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1323
 msgid "generate new keys"
 msgstr "сгенерировать новые ключи"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1324
 msgid "menu to change or unblock the PIN"
 msgstr "меню изменения или разблокировки PIN"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1325
 msgid "verify the PIN and list all data"
 msgstr "проверить PIN и показать все данные"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1634
+#: g10/card-util.c:1445 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Команда> "
 
-#: g10/card-util.c:1480
+#: g10/card-util.c:1483
 msgid "Admin-only command\n"
 msgstr "Команды администратора\n"
 
-#: g10/card-util.c:1511
+#: g10/card-util.c:1514
 msgid "Admin commands are allowed\n"
 msgstr "Команды администрирования разрешены\n"
 
-#: g10/card-util.c:1513
+#: g10/card-util.c:1516
 msgid "Admin commands are not allowed\n"
 msgstr "Команды администрирования не разрешены\n"
 
-#: g10/card-util.c:1587 g10/keyedit.c:2255
+#: g10/card-util.c:1590 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Недопустимая команда  (список команд: \"help\")\n"
 
@@ -1128,7 +1139,7 @@ msgstr "Недопустимая команда  (список команд: \"h
 msgid "--output doesn't work for this command\n"
 msgstr "--output не работает для данной команды\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "не могу открыть `%s'\n"
@@ -1422,7 +1433,7 @@ msgstr "использую подклключ %s вместо главного �
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "ключ %s: секретный ключ без открытого ключа - пропущен\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1438,27 +1449,27 @@ msgstr "|[файл]|создать подпись к файлу"
 msgid "|[file]|make a clear text signature"
 msgstr "|[файл]|создать прозрачную подпись к файлу"
 
-#: g10/gpg.c:372 sm/gpgsm.c:244
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "создать отделенную подпись"
 
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "зашифровать данные"
 
-#: g10/gpg.c:375 sm/gpgsm.c:246
+#: g10/gpg.c:375 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "зашифровать только симметричным шифром"
 
-#: g10/gpg.c:377 sm/gpgsm.c:247
+#: g10/gpg.c:377 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "расшифровать данные (по умолчанию)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:248
+#: g10/gpg.c:379 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "проверить подпись"
 
-#: g10/gpg.c:381 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "вывести список ключей"
 
@@ -1470,11 +1481,11 @@ msgstr "вывести список ключей и подписей"
 msgid "list and check key signatures"
 msgstr "вывести и проверить подписи ключей"
 
-#: g10/gpg.c:385 sm/gpgsm.c:254
+#: g10/gpg.c:385 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "вывести список ключей и их отпечатков"
 
-#: g10/gpg.c:386 sm/gpgsm.c:252
+#: g10/gpg.c:386 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "вывести список секретных ключей"
 
@@ -1510,11 +1521,11 @@ msgstr "создать сертификат отзыва"
 msgid "export keys"
 msgstr "экспортировать ключи"
 
-#: g10/gpg.c:397 sm/gpgsm.c:257
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "экспортировать ключи на сервер ключей"
 
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "импортировать ключи с сервера ключей"
 
@@ -1550,11 +1561,11 @@ msgstr "обновить таблицу доверий"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [файлы]|вывести хэши файлов"
 
-#: g10/gpg.c:430 sm/gpgsm.c:262
+#: g10/gpg.c:430 sm/gpgsm.c:264
 msgid "run in server mode"
 msgstr "запуск в режиме сервера"
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
 #: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1565,31 +1576,31 @@ msgstr ""
 "Параметры:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:279
+#: g10/gpg.c:434 sm/gpgsm.c:281
 msgid "create ascii armored output"
 msgstr "вывод в ASCII формате"
 
-#: g10/gpg.c:436 sm/gpgsm.c:291
+#: g10/gpg.c:436 sm/gpgsm.c:293
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|зашифровать для получателя NAME"
 
-#: g10/gpg.c:447 sm/gpgsm.c:327
+#: g10/gpg.c:447 sm/gpgsm.c:331
 msgid "use this user-id to sign or decrypt"
 msgstr "использовать данный User ID для подписывания и расшифрования"
 
-#: g10/gpg.c:448 sm/gpgsm.c:330
+#: g10/gpg.c:448 sm/gpgsm.c:334
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|установить уровень сжатия N (0 без сжатия)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:332
+#: g10/gpg.c:453 sm/gpgsm.c:336
 msgid "use canonical text mode"
 msgstr "использовать канонический текстовый режим"
 
-#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "вывод в указанный файл"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "не делать никаких изменений"
 
@@ -1605,7 +1616,7 @@ msgstr "строго следовать стандарту OpenPGP"
 msgid "generate PGP 2.x compatible messages"
 msgstr "создает сообщение совместимым с PGP 2.x"
 
-#: g10/gpg.c:553 sm/gpgsm.c:393
+#: g10/gpg.c:553 sm/gpgsm.c:397
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1613,7 +1624,7 @@ msgstr ""
 "@\n"
 "(См. документацию для более полного ознакомления с командами и параметрами)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:396
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1651,7 +1662,7 @@ msgstr ""
 "Подписи и их проверка, зашифрование и расшифрование\n"
 "действие по умолчанию зависит от входных данных\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:532
+#: g10/gpg.c:781 sm/gpgsm.c:538
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1679,7 +1690,7 @@ msgstr "Алгоритмы сжатия: "
 msgid "usage: gpg [options] "
 msgstr "использование: gpg [параметры] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:669
+#: g10/gpg.c:1045 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "несовместимые команды\n"
 
@@ -1764,449 +1775,449 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "неизвестный параметр в файле конфигурации `%s'\n"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr "отображать Фото ID при распечатке ключей"
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr "показывать ссылку на политики при распечатке подписей"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1544
 msgid "show all notations during signature listings"
 msgstr "показывать все примечания в списке подписей"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 "показывать добавленные пользователем примечания при распечатке подписей"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1552
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "показываеть предпочитаемый сервер ключей с списке подписей"
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr "показывать действительность Used ID при распечатке ключей"
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr "показывать отозванные и просроченные User ID при распечатке ключей"
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr "показывать отозванные и просроченные ключи при распечатке списка"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1560
 msgid "show the keyring name in key listings"
 msgstr "печатать имя таблиц ключей в списке ключей"
 
-#: g10/gpg.c:1564
+#: g10/gpg.c:1562
 msgid "show expiration dates during signature listings"
 msgstr "печатать даты истечения в списке подписей"
 
-#: g10/gpg.c:1827
+#: g10/gpg.c:1825
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libcrypt слишком старой версии (требуется %s, обнаружено %s)\n"
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1981
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "ЗАМЕЧАНИЕ: старый файл конфигурации по умолчанию `%s' проигнорирован\n"
 
-#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
+#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ЗАМЕЧАНИЕ: %s не предназначен для обычного применения!\n"
 
-#: g10/gpg.c:2401 g10/gpg.c:2413
+#: g10/gpg.c:2399 g10/gpg.c:2411
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2493
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' недопустимая таблица символов\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4084
+#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "не могу проанализировать URL сервера ключей\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2528
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2531
 msgid "invalid keyserver options\n"
 msgstr "недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2538
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2541
 msgid "invalid import options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2548
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2551
 msgid "invalid export options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2558
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопустимый список параметров\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2561
 msgid "invalid list options\n"
 msgstr "недопустимый список параметров\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2569
 msgid "display photo IDs during signature verification"
 msgstr "показывать Фото ID при проверке подписи"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2571
 msgid "show policy URLs during signature verification"
 msgstr "показывать ссылку на политики при проверке подписи"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2573
 msgid "show all notations during signature verification"
 msgstr "показывать все примечания в процессе проверки подписей"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2575
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2579
 msgid "show user-supplied notations during signature verification"
 msgstr "показывать добавленные пользователем примечания при проверке подписей"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2581
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "печатать предпочитаемые серверы ключей при проверке подписей"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2583
 msgid "show user ID validity during signature verification"
 msgstr "печатать действительность UserID при проверке подписей"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2585
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "показывать отозванные и просроченные User ID при проверке подписей"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2587
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "показывать отозванные и просроченные User ID при проверке подписей"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2589
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2591
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2598
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопустимые параметры проверки \n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2601
 msgid "invalid verify options\n"
 msgstr "недопустимые параметры проверки\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2608
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запуска для %s\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2782
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недопустимый список auto-key-locate\n"
 
-#: g10/gpg.c:2787
+#: g10/gpg.c:2785
 msgid "invalid auto-key-locate list\n"
 msgstr "недопустимый список auto-key-locate\n"
 
-#: g10/gpg.c:2873 sm/gpgsm.c:1220
+#: g10/gpg.c:2871 sm/gpgsm.c:1247
 msgid "WARNING: program may create a core file!\n"
 msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти программы!\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2875
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ВНИМАНИЕ: %s заместит %s\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2884
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не допускается использовать с %s!\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2887
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s не имеет смысла совместно с %s!\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2902
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "не будет работать с небезопасной памятью из-за %s\n"
 
-#: g10/gpg.c:2918
+#: g10/gpg.c:2916
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2922
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Нельзя одновременно подписать и зашифровать в режиме --pgp2\n"
 
-#: g10/gpg.c:2930
+#: g10/gpg.c:2928
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Следует использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
 
-#: g10/gpg.c:2943
+#: g10/gpg.c:2941
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "для зашифрования сообщения в режиме --pgp2 требуется шифр IDEA\n"
 
-#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
+#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1303
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
+#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1311
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран неверный алгоритм сжатия\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3025
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция для сертификации\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3040
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3042
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3044
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3046
 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:3050
+#: g10/gpg.c:3048
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:3053
+#: g10/gpg.c:3051
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ЗАМЕЧАНИЕ: простой режим S2K (0) строго не рекомендуется\n"
 
-#: g10/gpg.c:3057
+#: g10/gpg.c:3055
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3062
 msgid "invalid default preferences\n"
 msgstr "недопустимые предпочтения по умолчанию\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3071
 msgid "invalid personal cipher preferences\n"
 msgstr "недопустимые персональные предпочтения шифра\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3075
 msgid "invalid personal digest preferences\n"
 msgstr "недопустимые персональные предпочтения хэш-функции\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3079
 msgid "invalid personal compress preferences\n"
 msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
 
-#: g10/gpg.c:3114
+#: g10/gpg.c:3112
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s пока не работает совместно с %s\n"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3159
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать шифрование `%s' в режиме %s\n"
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3164
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать хэш-функцию `%s' в режиме %s\n"
 
-#: g10/gpg.c:3171
+#: g10/gpg.c:3169
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать сжатие `%s' в режиме %s\n"
 
-#: g10/gpg.c:3263
+#: g10/gpg.c:3261
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3272
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
-#: g10/gpg.c:3295
+#: g10/gpg.c:3293
 msgid "--store [filename]"
 msgstr "--store [файл]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3300
 msgid "--symmetric [filename]"
 msgstr "--symmetric [файл]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3302
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "симметричное шифрование `%s' не удалось: %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3312
 msgid "--encrypt [filename]"
 msgstr "--encrypt [файл]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3325
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [файл]"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3327
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "нельзя использовать --symmetric --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3332
+#: g10/gpg.c:3330
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3348
 msgid "--sign [filename]"
 msgstr "--sign [файл]"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3361
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [файл]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3376
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [файл]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3378
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3381
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --sign --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3401
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [файл]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3410
 msgid "--clearsign [filename]"
 msgstr "--clearsign [файл]"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3435
 msgid "--decrypt [filename]"
 msgstr "--decrypt [файл]"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3443
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3447
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3468
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [команды]"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3553
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "сбой при отправке на сервер ключей: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "сбой при получении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3557
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "сбой при экспорте ключа: %s\n"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3568
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "сбой при поиске на сервере ключей: %s\n"
 
-#: g10/gpg.c:3580
+#: g10/gpg.c:3578
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "сбой при обновлении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3631
+#: g10/gpg.c:3629
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразования из ASCII формата: %s\n"
 
-#: g10/gpg.c:3639
+#: g10/gpg.c:3637
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразования в ASCII формат: %s\n"
 
-#: g10/gpg.c:3729
+#: g10/gpg.c:3727
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "недопустимая хэш-функция `%s'\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3844
 msgid "[filename]"
 msgstr "[файл]"
 
-#: g10/gpg.c:3850
+#: g10/gpg.c:3848
 msgid "Go ahead and type your message ...\n"
 msgstr "Набирайте Ваше сообщение ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4160
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL политики сертификации неверен\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4162
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL политики подписи неверен\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4195
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
@@ -2218,7 +2229,7 @@ msgstr "используются ключи из этой таблицы клю�
 msgid "make timestamp conflicts only a warning"
 msgstr "при несоответствии отметки времени - только предупреждением"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:368
+#: g10/gpgv.c:75 sm/gpgsm.c:372
 msgid "|FD|write status info to this FD"
 msgstr "|FD|выводить инфромацию в файл с дескриптором FD"
 
@@ -6542,43 +6553,43 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "нет доступа %s - неработоспособная карта OpenPGP?\n"
 
-#: scd/scdaemon.c:105
+#: scd/scdaemon.c:108
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:357
+#: scd/scdaemon.c:114 sm/gpgsm.c:361
 msgid "read options from file"
 msgstr "получение параметров конфигурации из файла"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:124
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:126
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:129
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:134
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:135
 msgid "allow the use of admin card commands"
 msgstr "позволить использовать управляющие команды"
 
-#: scd/scdaemon.c:206
+#: scd/scdaemon.c:209
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Использование: scdaemon [параметры] (-h для подсказки)"
 
-#: scd/scdaemon.c:208
+#: scd/scdaemon.c:211
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6586,17 +6597,17 @@ msgstr ""
 "Синтаксис: scdaemon [параметры] [команда [аргументы]]\n"
 "Демон смарткарт для GnuPG\n"
 
-#: scd/scdaemon.c:671
+#: scd/scdaemon.c:658
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 "Используйте параметр `--daemon' для запуска приложения в фоновом режиме\n"
 
-#: scd/scdaemon.c:1019
+#: scd/scdaemon.c:1006
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "обработчик fd %d запущен\n"
 
-#: scd/scdaemon.c:1024
+#: scd/scdaemon.c:1011
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "обработчик fd %d остановлен\n"
@@ -6624,136 +6635,251 @@ msgstr "протокол dirmngr версии %d не поддерживаетс
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr "не могу подсоединиться к dirmngr - пытаемся откатиться назад\n"
 
-#: sm/certchain.c:174
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr ""
+
+#: sm/certchain.c:195
+msgid "chain"
+msgstr ""
+
+#: sm/certchain.c:196
+msgid "shell"
+msgstr ""
+
+#: sm/certchain.c:241
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "критичное дополнение сертификата %s не поддерживается"
 
-#: sm/certchain.c:212
+#: sm/certchain.c:279
 msgid "issuer certificate is not marked as a CA"
 msgstr "издатель сертификата не помечен как CA"
 
-#: sm/certchain.c:250
+#: sm/certchain.c:317
 msgid "critical marked policy without configured policies"
 msgstr "помеченная критичной политика без настроенных политик"
 
-#: sm/certchain.c:260
+#: sm/certchain.c:327
 #, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "не могу открыть `%s': %s\n"
 
-#: sm/certchain.c:267 sm/certchain.c:296
+#: sm/certchain.c:334 sm/certchain.c:363
 msgid "note: non-critical certificate policy not allowed"
 msgstr "замечание: не критичные политики сертификана не позволяются"
 
-#: sm/certchain.c:271 sm/certchain.c:300
+#: sm/certchain.c:338 sm/certchain.c:367
 msgid "certificate policy not allowed"
 msgstr "политика сертификата не дозволена"
 
-#: sm/certchain.c:411
+#: sm/certchain.c:478
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:431
+#: sm/certchain.c:498
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "число совпавших издателей: %d\n"
 
-#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
 msgid "failed to allocated keyDB handle\n"
 msgstr ""
 
-#: sm/certchain.c:675
+#: sm/certchain.c:742
 msgid "certificate has been revoked"
 msgstr "сертификат был отозван"
 
-#: sm/certchain.c:684
+#: sm/certchain.c:752
 msgid "no CRL found for certificate"
 msgstr "не найдена CRL для сертификата"
 
-#: sm/certchain.c:688
+#: sm/certchain.c:757
+msgid "the status of the certificate is unknown"
+msgstr ""
+
+#: sm/certchain.c:762
 msgid "the available CRL is too old"
 msgstr "достпуная CRL слишком стара"
 
-#: sm/certchain.c:690
+#: sm/certchain.c:764
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "проверьте, что \"dirmngr\" установлен корректно\n"
 
-#: sm/certchain.c:695
+#: sm/certchain.c:770
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "сбой проверки CRL: %s"
 
-#: sm/certchain.c:791
-msgid "no issuer found in certificate"
-msgstr "не найден издатель в сертификате"
-
-#: sm/certchain.c:820
+#: sm/certchain.c:799 sm/certchain.c:867
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "сертификат недостоверный: %s"
 
-#: sm/certchain.c:836
+#: sm/certchain.c:814 sm/certchain.c:899
 msgid "certificate not yet valid"
 msgstr "сертификат еще не достоверен"
 
-#: sm/certchain.c:849
+#: sm/certchain.c:815 sm/certchain.c:900
+#, fuzzy
+msgid "root certificate not yet valid"
+msgstr "сертификат еще не достоверен"
+
+#: sm/certchain.c:816 sm/certchain.c:901
+#, fuzzy
+msgid "intermediate certificate not yet valid"
+msgstr "сертификат еще не достоверен"
+
+#: sm/certchain.c:829
 msgid "certificate has expired"
 msgstr "сертификат просрочен"
 
-#: sm/certchain.c:892
-msgid "self-signed certificate has a BAD signature"
-msgstr "самоподписанный\tсертификат имеет ПЛОХУЮ подпись"
+#: sm/certchain.c:830
+#, fuzzy
+msgid "root certificate has expired"
+msgstr "сертификат просрочен"
 
-#: sm/certchain.c:960
-msgid "root certificate is not marked trusted"
-msgstr "корневой сертификат не помечен доверяемым"
+#: sm/certchain.c:831
+#, fuzzy
+msgid "intermediate certificate has expired"
+msgstr "сертификат просрочен"
+
+#: sm/certchain.c:873
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
+msgstr ""
+
+#: sm/certchain.c:882
+#, fuzzy
+msgid "certificate with invalid validity"
+msgstr "сертификат недостоверный: %s"
+
+#: sm/certchain.c:919
+#, fuzzy
+msgid "signature not created during lifetime of certificate"
+msgstr "ошибка чтения списка доверяемых корневых сертификатов\n"
+
+#: sm/certchain.c:921
+msgid "certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:922
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:926
+#, fuzzy
+msgid "  (  signature created at "
+msgstr "    подписей очищено: %lu\n"
+
+#: sm/certchain.c:927
+#, fuzzy
+msgid "  (certificate created at "
+msgstr "Сертификат отзыва создан.\n"
+
+#: sm/certchain.c:930
+#, fuzzy
+msgid "  (certificate valid from "
+msgstr "сертификат еще не достоверен"
+
+#: sm/certchain.c:931
+msgid "  (     issuer valid from "
+msgstr ""
 
-#: sm/certchain.c:975
+#: sm/certchain.c:961
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "отпечаток=%s\n"
 
-#: sm/certchain.c:983
+#: sm/certchain.c:970
 msgid "root certificate has now been marked as trusted\n"
 msgstr "корневой сертификат теперь помечен доверяемым\n"
 
-#: sm/certchain.c:998
+#: sm/certchain.c:983
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "в gpg-agent нельзя сделать сертификат доверяемым интерактивно\n"
 
-#: sm/certchain.c:1004
+#: sm/certchain.c:989
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 "для данной сессии запрещено делать сертификат доверяемым интерактивно\n"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1046
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr ""
+
+#: sm/certchain.c:1110
+msgid "no issuer found in certificate"
+msgstr "не найден издатель в сертификате"
+
+#: sm/certchain.c:1184
+msgid "self-signed certificate has a BAD signature"
+msgstr "самоподписанный\tсертификат имеет ПЛОХУЮ подпись"
+
+#: sm/certchain.c:1253
+msgid "root certificate is not marked trusted"
+msgstr "корневой сертификат не помечен доверяемым"
+
+#: sm/certchain.c:1266
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "сбой проверки списка доверий: %s\n"
 
-#: sm/certchain.c:1041 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr "цепочка сертификации слишком длинная\n"
 
-#: sm/certchain.c:1053
+#: sm/certchain.c:1307
 msgid "issuer certificate not found"
 msgstr "не найден издатель сертификата"
 
-#: sm/certchain.c:1086
+#: sm/certchain.c:1340
 msgid "certificate has a BAD signature"
 msgstr "сертификат имеет ПЛОХУЮ подпись"
 
-#: sm/certchain.c:1116
+#: sm/certchain.c:1371
 msgid "found another possible matching CA certificate - trying again"
 msgstr "найдено еще одно соответствие CA  сертификата - повторная попытки"
 
-#: sm/certchain.c:1167
+#: sm/certchain.c:1422
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "цепочка сертификации длиннее дозволенной CA (%d)"
 
+#: sm/certchain.c:1462 sm/certchain.c:1730
+#, fuzzy
+msgid "certificate is good\n"
+msgstr "цепочка сертификации слишком длинная\n"
+
+#: sm/certchain.c:1463
+#, fuzzy
+msgid "intermediate certificate is good\n"
+msgstr "дупликат сертификата `%s' удален\n"
+
+#: sm/certchain.c:1464
+#, fuzzy
+msgid "root certificate is good\n"
+msgstr "корневой сертификат не помечен доверяемым"
+
+#: sm/certchain.c:1620
+msgid "switching to chain model"
+msgstr ""
+
+#: sm/certchain.c:1629
+#, c-format
+msgid "validation model used: %s"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "chain model"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "shell model"
+msgstr ""
+
 #: sm/certcheck.c:101
 #, fuzzy, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
@@ -6793,11 +6919,11 @@ msgid "[Error - invalid DN]"
 msgstr "[Ошибка - недопустимый DN]"
 
 #: sm/certdump.c:936
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
 "\"%s\"\n"
-"S/N %s, ID %08lX, created %s"
+"S/N %s, ID 0x%08lX, created %s"
 msgstr ""
 "Введите фразу-пароль для доступа к секретному ключу:\n"
 "\"%s\"\n"
@@ -6807,7 +6933,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr "не задана применимость ключа - подразумеваем все\n"
 
-#: sm/certlist.c:131 sm/keylist.c:255
+#: sm/certlist.c:131 sm/keylist.c:258
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "ошибка получения информации применимости ключа: %s\n"
@@ -6928,171 +7054,171 @@ msgstr "ошибка создания временного файла: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "ошибка записи во временный файл: %s\n"
 
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:244
 msgid "|[FILE]|make a signature"
 msgstr "|[файл]|создать подпись"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:245
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[файл]|создать прозрачную подпись"
 
-#: sm/gpgsm.c:251
+#: sm/gpgsm.c:253
 msgid "list external keys"
 msgstr "вывести список внешних ключей"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 msgid "list certificate chain"
 msgstr "вывести список правил сертификатов"
 
-#: sm/gpgsm.c:256
+#: sm/gpgsm.c:258
 msgid "remove key from the public keyring"
 msgstr "удалить ключ из таблицы открытых ключей"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:261
 msgid "import certificates"
 msgstr "импорт сертификатов"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:262
 msgid "export certificates"
 msgstr "экспорт сертификатов"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 msgid "register a smartcard"
 msgstr "зарегистрировать смарткарту"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "pass a command to the dirmngr"
 msgstr "передать команду dirmngr"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "invoke gpg-protect-tool"
 msgstr "вызываем gpg-protect-tool"
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:268
 msgid "change a passphrase"
 msgstr "сменить фразу-пароль"
 
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
 msgid "create base-64 encoded output"
 msgstr "вывод в BASE64"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:287
 msgid "assume input is in PEM format"
 msgstr "предполагаем получение в формате PEM"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in base-64 format"
 msgstr "предполагаем получение в формате BASE64"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in binary format"
 msgstr "предполагаем получение в двоичном формате"
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:296
 msgid "use system's dirmngr if available"
 msgstr "используем системный dirmngr, если доступен"
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "never consult a CRL"
 msgstr "не сверять с CRL"
 
-#: sm/gpgsm.c:302
+#: sm/gpgsm.c:304
 msgid "check validity using OCSP"
 msgstr "проверка действительности используя OCSP"
 
-#: sm/gpgsm.c:305
+#: sm/gpgsm.c:309
 msgid "|N|number of certificates to include"
 msgstr "|N|число включаемых сертификатов"
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:312
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|взять информацию о политиках из FILE"
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:315
 msgid "do not check certificate policies"
 msgstr "не проверять политики сертификата"
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:319
 msgid "fetch missing issuer certificates"
 msgstr "запросить пропущенных издаталей сертификатов"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:323
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|использовать NAME как получателя по умолчанию"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:325
 msgid "use the default key as default recipient"
 msgstr "использовать ключ по умолчанию как получателя по умолчанию"
 
-#: sm/gpgsm.c:338
+#: sm/gpgsm.c:342
 msgid "don't use the terminal at all"
 msgstr "не использовать терминал совсем"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:346
 msgid "force v3 signatures"
 msgstr "принудительная подпись v3"
 
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:347
 msgid "always use a MDC for encryption"
 msgstr "всегда использовать MDC для шифрования"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:352
 msgid "batch mode: never ask"
 msgstr "пакетный режим: ничего не запрашивать"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:353
 msgid "assume yes on most questions"
 msgstr "предполагать Да на большинство вопросов"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:354
 msgid "assume no on most questions"
 msgstr "предполагать Нет на большинство вопросов"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:356
 msgid "add this keyring to the list of keyrings"
 msgstr "добавить данную таблицу ключей в список таблиц ключей"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:357
 msgid "add this secret keyring to the list"
 msgstr "добавить данную таблицу секретных ключей в список"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|использовать NAME как секретный ключ по умолчанию"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:359
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|использовать данный сервер ключей для поиска ключей"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:360
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|установить кодировку терминала в NAME"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:364
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|установить уровень отладки в LEVEL"
 
-#: sm/gpgsm.c:375
+#: sm/gpgsm.c:379
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|загрузить модуль дополнения FILE"
 
-#: sm/gpgsm.c:381
+#: sm/gpgsm.c:385
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|использовать алгоритм шифрования NAME"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:387
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|использовать хеш-функцию NAME"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:389
 msgid "|N|use compress algorithm N"
 msgstr "|N|использовать алгоритм сжатия N"
 
-#: sm/gpgsm.c:522
+#: sm/gpgsm.c:528
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Использование: gpgsm [параметры] [файлы] (-h для подсказки)"
 
-#: sm/gpgsm.c:525
+#: sm/gpgsm.c:531
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7103,30 +7229,35 @@ msgstr ""
 "протокол\n"
 "операция по умолчанию зависит от входных данных\n"
 
-#: sm/gpgsm.c:604
+#: sm/gpgsm.c:610
 msgid "usage: gpgsm [options] "
 msgstr "использование: gpgsm [параметры] "
 
-#: sm/gpgsm.c:685
+#: sm/gpgsm.c:691
 #, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "не могу зашифровать для `%s': %s\n"
 
-#: sm/gpgsm.c:1237
+#: sm/gpgsm.c:713
+#, fuzzy, c-format
+msgid "unknown validation model `%s'\n"
+msgstr "неизвестный параметр `%s'\n"
+
+#: sm/gpgsm.c:1264
 msgid "WARNING: running with faked system time: "
 msgstr "ВНИМАНИЕ: выполняемся с подделанным системным временем: "
 
-#: sm/gpgsm.c:1316
+#: sm/gpgsm.c:1344
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1334
+#: sm/gpgsm.c:1362
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "невозможно подписать используя `%s': %s\n"
 
-#: sm/gpgsm.c:1529
+#: sm/gpgsm.c:1543
 msgid "this command has not yet been implemented\n"
 msgstr "данная команды всё еще не реализована\n"
 
@@ -7148,7 +7279,7 @@ msgstr "ошибка базовой проверки сертификата - н
 msgid "error importing certificate: %s\n"
 msgstr "ошибка импортирования сертификата: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:375
+#: sm/import.c:541 tools/gpg-connect-agent.c:374
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "ошибка чтения ввода: %s\n"
@@ -7231,7 +7362,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234
+#: sm/qualified.c:234 sm/verify.c:536
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7252,27 +7383,32 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr ""
 
-#: sm/verify.c:386
+#: sm/verify.c:388
 msgid "Signature made "
 msgstr "Подпись сделана"
 
-#: sm/verify.c:390
+#: sm/verify.c:392
 msgid "[date not given]"
 msgstr "[дата не указана]"
 
-#: sm/verify.c:391
-#, c-format
-msgid " using certificate ID %08lX\n"
+#: sm/verify.c:393
+#, fuzzy, c-format
+msgid " using certificate ID 0x%08lX\n"
 msgstr "с использованием сертификата ID %08lX\n"
 
-#: sm/verify.c:507
+#: sm/verify.c:514
 msgid "Good signature from"
 msgstr "Действительная подпись от"
 
-#: sm/verify.c:508
+#: sm/verify.c:515
 msgid "                aka"
 msgstr "                aka"
 
+#: sm/verify.c:533
+#, fuzzy
+msgid "This is a qualified signature\n"
+msgstr "Это будет самоподпись.\n"
+
 #: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 msgid "quiet"
 msgstr ""
@@ -7309,132 +7445,137 @@ msgstr ""
 "Синтаксис: gpg-connect-agent: [параметры]\n"
 "Связывается с запущенным агентом и отcылает команды\n"
 
-#: tools/gpg-connect-agent.c:315
+#: tools/gpg-connect-agent.c:314
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "параметр \"%s\" требует программы и опциональных аргументов\n"
 
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:323
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "параметр \"%s\" игнорирован по причине \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:382
+#: tools/gpg-connect-agent.c:381
 msgid "line too long - skipped\n"
 msgstr "строка слишком длинная - пропущено\n"
 
-#: tools/gpg-connect-agent.c:386
+#: tools/gpg-connect-agent.c:385
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:458
+#: tools/gpg-connect-agent.c:457
 #, c-format
 msgid "unknown command `%s'\n"
 msgstr "неизвестная команда `%s'\n"
 
-#: tools/gpg-connect-agent.c:466
+#: tools/gpg-connect-agent.c:465
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "сбой отправки строки: %s\n"
 
-#: tools/gpg-connect-agent.c:474
+#: tools/gpg-connect-agent.c:473
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "сбой получения строки: %s\n"
 
-#: tools/gpg-connect-agent.c:784
+#: tools/gpg-connect-agent.c:789
 #, c-format
 msgid "error sending %s command: %s\n"
 msgstr "ошибка отправки %s команды: %s\n"
 
-#: tools/gpg-connect-agent.c:793
+#: tools/gpg-connect-agent.c:798
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "ошибка отправки стандартных параметров: %s\n"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
 msgid "Options controlling the diagnostic output"
 msgstr "Параметры контролирующие вывод диагностики"
 
-#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
+#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
 msgid "Options controlling the configuration"
 msgstr "Параметры контролирующие конфигурацию"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
-#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
+#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
 msgid "Options useful for debugging"
 msgstr "Параметры полезные для отладки"
 
-#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
-#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|сохранять журнал режима сервера в FILE"
 
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
 msgid "Options controlling the security"
 msgstr "Параметры контролирующие безопасность"
 
-#: tools/gpgconf-comp.c:501
+#: tools/gpgconf-comp.c:492
 #, fuzzy
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|кеш PIN просрочен после N секунд"
 
-#: tools/gpgconf-comp.c:505
+#: tools/gpgconf-comp.c:496
 #, fuzzy
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|кеш PIN просрочен после N секунд"
 
-#: tools/gpgconf-comp.c:509
+#: tools/gpgconf-comp.c:500
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:510
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:638
+#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#, fuzzy
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAME|зашифровать для получателя NAME"
+
+#: tools/gpgconf-comp.c:635
 msgid "Configuration for Keyservers"
 msgstr "Конфигурация серверов ключей"
 
-#: tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:640
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:685
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:705
+#: tools/gpgconf-comp.c:708
 msgid "do not check CRLs for root certificates"
 msgstr "не проверять CRLd для корневых сертификатов"
 
-#: tools/gpgconf-comp.c:749
+#: tools/gpgconf-comp.c:752
 msgid "Options controlling the format of the output"
 msgstr "Параметры контрролирующие формат вывода"
 
-#: tools/gpgconf-comp.c:785
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
 msgid "Configuration for HTTP servers"
 msgstr "Настройки HTTP серверов"
 
-#: tools/gpgconf-comp.c:806
+#: tools/gpgconf-comp.c:809
 msgid "use system's HTTP proxy setting"
 msgstr "использовать системные настройки HTTP проки"
 
-#: tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:814
 msgid "Configuration of LDAP servers to use"
 msgstr "Настройки LDAP серверов"
 
-#: tools/gpgconf-comp.c:848
+#: tools/gpgconf-comp.c:851
 msgid "Configuration for OCSP"
 msgstr "Настройки OCSP"
 
-#: tools/gpgconf-comp.c:2681
+#: tools/gpgconf-comp.c:2684
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/sk.po b/po/sk.po
index 8402e1098..1fdb02e9e 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-07-05 18:01+0200\n"
+"POT-Creation-Date: 2007-08-10 15:49+0200\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <mmajer@econ.umb.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -18,54 +18,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: agent/call-pinentry.c:426
+#: agent/call-pinentry.c:436
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:429
+#: agent/call-pinentry.c:439
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: agent/call-pinentry.c:476
+#: agent/call-pinentry.c:486
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
+#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
 #, fuzzy
 msgid "PIN too long"
 msgstr "riadok je pr�li� dlh�\n"
 
-#: agent/call-pinentry.c:497
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "heslo je pr�li� dlh�\n"
 
-#: agent/call-pinentry.c:505
+#: agent/call-pinentry.c:515
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Neplatn� znak ve mene\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:520
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:522
+#: agent/call-pinentry.c:532
 #, fuzzy
 msgid "Bad PIN"
 msgstr "nespr�vne MPI"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:533
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "nespr�vne heslo"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:569
 #, fuzzy
 msgid "Passphrase"
 msgstr "nespr�vne heslo"
@@ -82,14 +82,14 @@ msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 msgid "can't create `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
 #: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
-#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1796
+#: sm/gpgsm.c:1833 sm/gpgsm.c:1871 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
@@ -176,35 +176,46 @@ msgstr[1] ""
 msgid "Take this one anyway"
 msgstr "Pou�i� napriek tomu tento k���? "
 
-#: agent/genkey.c:99
+#: agent/genkey.c:99 agent/genkey.c:114
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Vlo�i� heslo\n"
 
-#: agent/genkey.c:144
+#: agent/genkey.c:107
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+
+#: agent/genkey.c:113
+msgid "Yes, protection is not needed"
+msgstr ""
+
+#: agent/genkey.c:158
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Na ochranu V�ho tajn�ho k���a mus�te zada� heslo.\n"
 "\n"
 
-#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
+#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "zmeni� heslo"
 
-#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
 #: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:263
+#: agent/genkey.c:280
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "zmeni� heslo"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -214,105 +225,105 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:103
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
-#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
 #: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "s dodato�n�mi inform�ciami"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
-#: sm/gpgsm.c:337
+#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "by� o trochu tich��"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:109
+#: agent/gpg-agent.c:118 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:119
+#: agent/gpg-agent.c:125 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:125
+#: agent/gpg-agent.c:126
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "vyh�ada� k���e na serveri k���ov"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:129
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualizova� datab�zu d�very"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:145
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:206 sm/gpgsm.c:525 tools/gpg-connect-agent.c:124
 #: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
@@ -320,143 +331,143 @@ msgstr ""
 "Chyby ozn�mte, pros�m, na adresu <gnupg-bugs@gnu.org>.\n"
 "Pripomienky k prekladu <sk-i18n@lists.linux.sk>.\n"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:262
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
+#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
-#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:340 sm/gpgsm.c:772 sm/gpgsm.c:775 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
+#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:863
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� s�bor s mo�nos�ami `%s'\n"
 
-#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
-#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: scd/scdaemon.c:421 sm/gpgsm.c:867 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "s�bor s mo�nos�ami `%s': %s\n"
 
-#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
+#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:874
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "chyba pri vytv�ran� `%s': %s\n"
 
-#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
-#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:921
+#: agent/gpg-agent.c:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
+#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:908
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nem��em vytvori� adres�r `%s': %s\n"
 
-#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
+#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
+#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "chyba pri posielan� na `%s': %s\n"
 
-#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
+#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
+#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: adres�r vytvoren�\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1377
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "datab�za d�very: proced�ra read() (n=%d) zlyhala: %s\n"
 
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1381
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: nem��em vytvori� adres�r: %s\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1497
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1519
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
+#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
 
-#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
+#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: presko�en�: %s\n"
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1752
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:751
+#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "zl� form�t premennej prostredia GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
-#: tools/gpg-connect-agent.c:762
+#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verzie %d nie je podporovan�\n"
@@ -521,42 +532,42 @@ msgstr "chyba pri vytv�ran� hesla: %s\n"
 msgid "cancelled\n"
 msgstr "Zru�i�"
 
-#: agent/trustlist.c:131 agent/trustlist.c:319
+#: agent/trustlist.c:132 agent/trustlist.c:322
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: agent/trustlist.c:146
+#: agent/trustlist.c:147
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: agent/trustlist.c:166 agent/trustlist.c:174
+#: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:180
+#: agent/trustlist.c:181
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "tajn� �asti k���a nie s� dostupn�\n"
 
-#: agent/trustlist.c:215
+#: agent/trustlist.c:216
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "chyba pri ��tan�: %s\n"
 
-#: agent/trustlist.c:241 agent/trustlist.c:248
+#: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:280
+#: agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: agent/trustlist.c:381 agent/trustlist.c:420
+#: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -569,7 +580,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:496
+#: agent/trustlist.c:507
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -579,7 +590,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:505
+#: agent/trustlist.c:516
 msgid "Correct"
 msgstr ""
 
@@ -591,58 +602,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:525
+#: agent/trustlist.c:536
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 #, fuzzy
 msgid "Yes"
 msgstr "ano"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:393
+#: common/exechelp.c:302 common/exechelp.c:390
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: common/exechelp.c:369 common/exechelp.c:426
+#: common/exechelp.c:366 common/exechelp.c:423
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "nemo�no otvori� s�bor: %s\n"
 
-#: common/exechelp.c:405 common/exechelp.c:635
+#: common/exechelp.c:402 common/exechelp.c:632
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: common/exechelp.c:461 common/exechelp.c:504
+#: common/exechelp.c:458 common/exechelp.c:501
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:469
+#: common/exechelp.c:466
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
 
-#: common/exechelp.c:475 common/exechelp.c:515
+#: common/exechelp.c:472 common/exechelp.c:512
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: common/exechelp.c:510
+#: common/exechelp.c:507
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:521
+#: common/exechelp.c:518
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
@@ -661,26 +672,26 @@ msgstr "[User id not found]"
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: common/simple-pwquery.c:376
+#: common/simple-pwquery.c:373
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nem��em sa pripoji� k `%s': %s\n"
 
-#: common/simple-pwquery.c:387
+#: common/simple-pwquery.c:384
 msgid "communication problem with gpg-agent\n"
 msgstr "probl�m v komunik�cii s gpg-agentom\n"
 
-#: common/simple-pwquery.c:397
+#: common/simple-pwquery.c:394
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "probl�m s agentom: agent vracia 0x%lx\n"
 
-#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+#: common/simple-pwquery.c:557 common/simple-pwquery.c:653
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "zru�en� u��vate�om\n"
 
-#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+#: common/simple-pwquery.c:572 common/simple-pwquery.c:659
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "probl�m s agentom: agent vracia 0x%lx\n"
@@ -862,7 +873,7 @@ msgstr "VAROVANIE: n�jden� neplatn� form�t z�pisu d�tumu\n"
 msgid "not human readable"
 msgstr "nie je v priamo �itate�nom form�te"
 
-#: g10/card-util.c:62 g10/card-util.c:305
+#: g10/card-util.c:62 g10/card-util.c:308
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "tajn� k��� nie je dostupn�"
@@ -872,166 +883,166 @@ msgstr "tajn� k��� nie je dostupn�"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1391 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "nemo�no previes� v d�vkovom m�de\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
 #: g10/keygen.c:1644
 msgid "Your selection? "
 msgstr "V� v�ber? "
 
-#: g10/card-util.c:215 g10/card-util.c:265
+#: g10/card-util.c:218 g10/card-util.c:268
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:412
+#: g10/card-util.c:415
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 #, fuzzy
 msgid "unspecified"
 msgstr "D�vod nebol �pecifikovan�"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 #, fuzzy
 msgid "not forced"
 msgstr "nespracovan�"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:518
+#: g10/card-util.c:521
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:523
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:525
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:539
+#: g10/card-util.c:542
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:544
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:559
+#: g10/card-util.c:562
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:580
+#: g10/card-util.c:583
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "�iadny zodpovedaj�ci verejn� k���: %s\n"
 
-#: g10/card-util.c:588
+#: g10/card-util.c:591
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
+#: g10/card-util.c:689 g10/card-util.c:758 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: g10/card-util.c:694
+#: g10/card-util.c:697
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:704
+#: g10/card-util.c:707
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:763
+#: g10/card-util.c:766
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:773
+#: g10/card-util.c:776
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:793
+#: g10/card-util.c:796
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualizova� predvo�by"
 
-#: g10/card-util.c:801
+#: g10/card-util.c:804
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:813
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/card-util.c:831
+#: g10/card-util.c:834
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:845
+#: g10/card-util.c:848
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: g10/card-util.c:866
+#: g10/card-util.c:869
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "vyp�sa� fingerprint"
 
-#: g10/card-util.c:889
+#: g10/card-util.c:892
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: g10/card-util.c:937
+#: g10/card-util.c:940
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:941
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 
-#: g10/card-util.c:947
+#: g10/card-util.c:950
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
 
-#: g10/card-util.c:1031
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1051 g10/card-util.c:1060
+#: g10/card-util.c:1054 g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1075
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1084
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1039,136 +1050,136 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1115
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
 
-#: g10/card-util.c:1117 g10/card-util.c:1194
+#: g10/card-util.c:1120 g10/card-util.c:1197
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/card-util.c:1118 g10/card-util.c:1196
+#: g10/card-util.c:1121 g10/card-util.c:1199
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1198
+#: g10/card-util.c:1122 g10/card-util.c:1201
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1135 g10/card-util.c:1214 g10/keyedit.c:945
+#: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
 #: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�ber.\n"
 
-#: g10/card-util.c:1191
+#: g10/card-util.c:1194
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
 
-#: g10/card-util.c:1226
+#: g10/card-util.c:1229
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nezn�my ochrann� algoritmus\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1234
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1239
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/card-util.c:1304 g10/keyedit.c:1362
+#: g10/card-util.c:1307 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "ukon�i� toto menu"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1309
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1307 g10/keyedit.c:1365
+#: g10/card-util.c:1310 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "uk�za� t�to pomoc"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1312
 #, fuzzy
 msgid "list all available data"
 msgstr "K��� k dispoz�cii na: "
 
-#: g10/card-util.c:1312
+#: g10/card-util.c:1315
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1313
+#: g10/card-util.c:1316
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1317
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1315
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "change the login name"
 msgstr "zmeni� dobu platnosti"
 
-#: g10/card-util.c:1316
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "change the language preferences"
 msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1320
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vyp�sa� fingerprint"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1322
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1323
 #, fuzzy
 msgid "generate new keys"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1324
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1325
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442 g10/keyedit.c:1634
+#: g10/card-util.c:1445 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Pr�kaz> "
 
-#: g10/card-util.c:1480
+#: g10/card-util.c:1483
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1511
+#: g10/card-util.c:1514
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1513
+#: g10/card-util.c:1516
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/card-util.c:1587 g10/keyedit.c:2255
+#: g10/card-util.c:1590 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 
@@ -1176,7 +1187,7 @@ msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output pre tento pr�kaz nefunguje\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nemo�no otvori� `%s'\n"
@@ -1484,7 +1495,7 @@ msgstr "pou��vam sekund�rny k��� %08lX namiesto prim�rneho k���a %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a - presko�en�\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1500,27 +1511,27 @@ msgstr "|[s�bor]|vytvori� podpis"
 msgid "|[file]|make a clear text signature"
 msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
 
-#: g10/gpg.c:372 sm/gpgsm.c:244
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "vytvori� podpis oddelen� od dokumentu"
 
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "�ifrova� d�ta"
 
-#: g10/gpg.c:375 sm/gpgsm.c:246
+#: g10/gpg.c:375 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrovanie len so symetrickou �ifrou"
 
-#: g10/gpg.c:377 sm/gpgsm.c:247
+#: g10/gpg.c:377 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "de�ifrova� d�ta (implicitne)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:248
+#: g10/gpg.c:379 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "verifikova� podpis"
 
-#: g10/gpg.c:381 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "vyp�sa� zoznam k���ov"
 
@@ -1533,11 +1544,11 @@ msgstr "vyp�sa� zoznam k���ov a podpisov"
 msgid "list and check key signatures"
 msgstr "skontrolova� podpisy k���ov"
 
-#: g10/gpg.c:385 sm/gpgsm.c:254
+#: g10/gpg.c:385 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "vyp�sa� zoznam k���ov a fingerprintov"
 
-#: g10/gpg.c:386 sm/gpgsm.c:252
+#: g10/gpg.c:386 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "vyp�sa� zoznam tajn�ch k���ov"
 
@@ -1573,11 +1584,11 @@ msgstr "vytvori� revoka�n� certifik�t"
 msgid "export keys"
 msgstr "exportova� k���e"
 
-#: g10/gpg.c:397 sm/gpgsm.c:257
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "exportova� k���e na server k���ov"
 
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "importova� k���e zo servera k���ov"
 
@@ -1613,11 +1624,11 @@ msgstr "aktualizova� datab�zu d�very"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [s�bory]|vyp�� hash"
 
-#: g10/gpg.c:430 sm/gpgsm.c:262
+#: g10/gpg.c:430 sm/gpgsm.c:264
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
 #: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1628,35 +1639,35 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:279
+#: g10/gpg.c:434 sm/gpgsm.c:281
 msgid "create ascii armored output"
 msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
 
-#: g10/gpg.c:436 sm/gpgsm.c:291
+#: g10/gpg.c:436 sm/gpgsm.c:293
 msgid "|NAME|encrypt for NAME"
 msgstr "|MENO|�ifrova� pre MENO"
 
-#: g10/gpg.c:447 sm/gpgsm.c:327
+#: g10/gpg.c:447 sm/gpgsm.c:331
 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:448 sm/gpgsm.c:330
+#: g10/gpg.c:448 sm/gpgsm.c:334
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavi� �rove� komprim�cie N (0 - �iadna\n"
 " komprim�cia)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:332
+#: g10/gpg.c:453 sm/gpgsm.c:336
 msgid "use canonical text mode"
 msgstr "pou�i� k�nonick� textov� m�d"
 
-#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "pou�i� ako v�stupn� s�bor"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "nevykona� �iadne zmeny"
 
@@ -1672,7 +1683,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:393
+#: g10/gpg.c:553 sm/gpgsm.c:397
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1681,7 +1692,7 @@ msgstr ""
 "(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
 "mo�nost�)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:396
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1721,7 +1732,7 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:532
+#: g10/gpg.c:781 sm/gpgsm.c:538
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1749,7 +1760,7 @@ msgstr "Kompresia: "
 msgid "usage: gpg [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:669
+#: g10/gpg.c:1045 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "konfliktn� pr�kazy\n"
 
@@ -1828,466 +1839,466 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: 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:1548
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1554
+#: 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:1556
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1562
+#: 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:1564
+#: 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:1827
+#: g10/gpg.c:1825
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1981
 #, 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:2243 g10/gpg.c:2884 g10/gpg.c:2896
+#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
 #, 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:2401 g10/gpg.c:2413
+#: g10/gpg.c:2399 g10/gpg.c:2411
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2493
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4084
+#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
 #, 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:2530
+#: g10/gpg.c:2528
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2531
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2538
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2541
 msgid "invalid import options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2548
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2551
 msgid "invalid export options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2558
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2561
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2569
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2571
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2573
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2575
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2579
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2581
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2585
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2587
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2589
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2591
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2598
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2608
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2782
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2787
+#: g10/gpg.c:2785
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2873 sm/gpgsm.c:1220
+#: g10/gpg.c:2871 sm/gpgsm.c:1247
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2875
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prep��e %s\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2884
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolen� pou��va� %s s %s!\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2887
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�va s %s zmysel!\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2902
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/gpg.c:2918
+#: g10/gpg.c:2916
 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:2924
+#: g10/gpg.c:2922
 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:2930
+#: g10/gpg.c:2928
 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:2943
+#: g10/gpg.c:2941
 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:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
+#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1303
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
+#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1311
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3025
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3040
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3042
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3044
 #, 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:3048
+#: g10/gpg.c:3046
 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:3050
+#: g10/gpg.c:3048
 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:3053
+#: g10/gpg.c:3051
 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:3057
+#: g10/gpg.c:3055
 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:3064
+#: g10/gpg.c:3062
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� predvo�by\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3071
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3075
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3079
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
 
-#: g10/gpg.c:3114
+#: g10/gpg.c:3112
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s e�te nepracuje s %s\n"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3159
 #, 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:3166
+#: g10/gpg.c:3164
 #, 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:3171
+#: g10/gpg.c:3169
 #, 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:3263
+#: g10/gpg.c:3261
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3272
 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:3295
+#: g10/gpg.c:3293
 msgid "--store [filename]"
 msgstr "--store [meno s�boru]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3300
 msgid "--symmetric [filename]"
 msgstr "--symmetric [meno s�boru]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3302
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3312
 msgid "--encrypt [filename]"
 msgstr "--encrypt [meno s�boru]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3325
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3327
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3332
+#: g10/gpg.c:3330
 #, 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:3350
+#: g10/gpg.c:3348
 msgid "--sign [filename]"
 msgstr "--sign [meno s�boru]"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3361
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3376
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3378
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3381
 #, 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:3403
+#: g10/gpg.c:3401
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [meno s�boru]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3410
 msgid "--clearsign [filename]"
 msgstr "--clearsign [meno s�boru]"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3435
 msgid "--decrypt [filename]"
 msgstr "--decrypt [meno s�boru]"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3443
 msgid "--sign-key user-id"
 msgstr "--sign-key id u��vate�a"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3447
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u��vate�a"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3468
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u��vate�a [pr�kazy]"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3553
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3557
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export k���a: %s\n"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3568
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa n�js� server: %s\n"
 
-#: g10/gpg.c:3580
+#: g10/gpg.c:3578
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualiz�cia servera zlyhala: %s\n"
 
-#: g10/gpg.c:3631
+#: g10/gpg.c:3629
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3639
+#: g10/gpg.c:3637
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3729
+#: g10/gpg.c:3727
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3844
 msgid "[filename]"
 msgstr "[meno s�boru]"
 
-#: g10/gpg.c:3850
+#: g10/gpg.c:3848
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite p�sa� svoju spr�vu ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4160
 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:4162
 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:4195
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
@@ -2300,7 +2311,7 @@ msgstr "Zmaza� tento k��� zo s�boru k���ov? "
 msgid "make timestamp conflicts only a warning"
 msgstr "konflikt �asov�ho raz�tka"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:368
+#: g10/gpgv.c:75 sm/gpgsm.c:372
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zap�sa� inform�cie o stave do tohto FD"
 
@@ -6755,64 +6766,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 
-#: scd/scdaemon.c:105
+#: scd/scdaemon.c:108
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:357
+#: scd/scdaemon.c:114 sm/gpgsm.c:361
 #, fuzzy
 msgid "read options from file"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:124
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|MENO|pou�i� MENO ako implicitn�ho adres�ta"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|MENO|pou�i� MENO ako implicitn�ho adres�ta"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:129
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "v�bec nepou��va� termin�l"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:134
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:135
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "konfliktn� pr�kazy\n"
 
-#: scd/scdaemon.c:206
+#: scd/scdaemon.c:209
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: scd/scdaemon.c:208
+#: scd/scdaemon.c:211
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:671
+#: scd/scdaemon.c:658
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1019
+#: scd/scdaemon.c:1006
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1024
+#: scd/scdaemon.c:1011
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6841,143 +6852,257 @@ msgstr "gpg-agent protokol verzie %d nie je podporovan�\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:174
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr ""
+
+#: sm/certchain.c:195
+msgid "chain"
+msgstr ""
+
+#: sm/certchain.c:196
+#, fuzzy
+msgid "shell"
+msgstr "help"
+
+#: sm/certchain.c:241
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agent protokol verzie %d nie je podporovan�\n"
 
-#: sm/certchain.c:212
+#: sm/certchain.c:279
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:250
+#: sm/certchain.c:317
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:260
+#: sm/certchain.c:327
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
 
-#: sm/certchain.c:267 sm/certchain.c:296
+#: sm/certchain.c:334 sm/certchain.c:363
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:271 sm/certchain.c:300
+#: sm/certchain.c:338 sm/certchain.c:367
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: sm/certchain.c:411
+#: sm/certchain.c:478
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:431
+#: sm/certchain.c:498
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: sm/certchain.c:675
+#: sm/certchain.c:742
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "POZN�MKA: k��� bol revokovan�"
 
-#: sm/certchain.c:684
+#: sm/certchain.c:752
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "nespr�vny certifik�t"
 
-#: sm/certchain.c:688
+#: sm/certchain.c:757
+msgid "the status of the certificate is unknown"
+msgstr ""
+
+#: sm/certchain.c:762
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "K��� k dispoz�cii na: "
 
-#: sm/certchain.c:690
+#: sm/certchain.c:764
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:695
+#: sm/certchain.c:770
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
 
-#: sm/certchain.c:791
-#, fuzzy
-msgid "no issuer found in certificate"
-msgstr "vytvori� revoka�n� certifik�t"
-
-#: sm/certchain.c:820
+#: sm/certchain.c:799 sm/certchain.c:867
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:836
+#: sm/certchain.c:814 sm/certchain.c:899
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:849
+#: sm/certchain.c:815 sm/certchain.c:900
+#, fuzzy
+msgid "root certificate not yet valid"
+msgstr "zapisujem tajn� k��� do `%s'\n"
+
+#: sm/certchain.c:816 sm/certchain.c:901
+msgid "intermediate certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:829
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Platnos� k���a vypr�ala!"
 
-#: sm/certchain.c:892
-msgid "self-signed certificate has a BAD signature"
+#: sm/certchain.c:830
+#, fuzzy
+msgid "root certificate has expired"
+msgstr "Platnos� k���a vypr�ala!"
+
+#: sm/certchain.c:831
+#, fuzzy
+msgid "intermediate certificate has expired"
+msgstr "Platnos� k���a vypr�ala!"
+
+#: sm/certchain.c:873
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:960
-msgid "root certificate is not marked trusted"
+#: sm/certchain.c:882
+#, fuzzy
+msgid "certificate with invalid validity"
+msgstr "Platnos� k���a vypr�ala!"
+
+#: sm/certchain.c:919
+msgid "signature not created during lifetime of certificate"
+msgstr ""
+
+#: sm/certchain.c:921
+msgid "certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:922
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:926
+#, fuzzy
+msgid "  (  signature created at "
+msgstr "               nov� podpisy: %lu\n"
+
+#: sm/certchain.c:927
+#, fuzzy
+msgid "  (certificate created at "
+msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
+
+#: sm/certchain.c:930
+#, fuzzy
+msgid "  (certificate valid from "
+msgstr "nespr�vny certifik�t"
+
+#: sm/certchain.c:931
+msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:975
+#: sm/certchain.c:961
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "vyp�sa� fingerprint"
 
-#: sm/certchain.c:983
+#: sm/certchain.c:970
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:998
+#: sm/certchain.c:983
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1004
+#: sm/certchain.c:989
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1046
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr ""
+
+#: sm/certchain.c:1110
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "vytvori� revoka�n� certifik�t"
+
+#: sm/certchain.c:1184
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:1253
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:1266
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
 
-#: sm/certchain.c:1041 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1053
+#: sm/certchain.c:1307
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1086
+#: sm/certchain.c:1340
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifikova� podpis"
 
-#: sm/certchain.c:1116
+#: sm/certchain.c:1371
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1167
+#: sm/certchain.c:1422
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
+#: sm/certchain.c:1462 sm/certchain.c:1730
+#, fuzzy
+msgid "certificate is good\n"
+msgstr "duplicita predvo�by %c%lu\n"
+
+#: sm/certchain.c:1463
+#, fuzzy
+msgid "intermediate certificate is good\n"
+msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
+
+#: sm/certchain.c:1464
+#, fuzzy
+msgid "root certificate is good\n"
+msgstr "nespr�vny certifik�t"
+
+#: sm/certchain.c:1620
+msgid "switching to chain model"
+msgstr ""
+
+#: sm/certchain.c:1629
+#, c-format
+msgid "validation model used: %s"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "chain model"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "shell model"
+msgstr ""
+
 #: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
@@ -7025,7 +7150,7 @@ msgstr "chyba: neplatn� odtla�ok\n"
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
 "\"%s\"\n"
-"S/N %s, ID %08lX, created %s"
+"S/N %s, ID 0x%08lX, created %s"
 msgstr ""
 "Potrebujete heslo, aby ste odomkli tajn� k��� pre u��vate�a:\n"
 "\"%.*s\"\n"
@@ -7035,7 +7160,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:131 sm/keylist.c:255
+#: sm/certlist.c:131 sm/keylist.c:258
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
@@ -7157,187 +7282,187 @@ msgstr "chyba pri vytv�ran� hesla: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "zapisujem do '%s'\n"
 
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[s�bor]|vytvori� podpis"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
 
-#: sm/gpgsm.c:251
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list external keys"
 msgstr "vyp�sa� zoznam tajn�ch k���ov"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list certificate chain"
 msgstr "nespr�vny certifik�t"
 
-#: sm/gpgsm.c:256
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "import certificates"
 msgstr "nespr�vny certifik�t"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:262
 #, fuzzy
 msgid "export certificates"
 msgstr "nespr�vny certifik�t"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:268
 #, fuzzy
 msgid "change a passphrase"
 msgstr "zmeni� heslo"
 
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:287
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:296
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:302
+#: sm/gpgsm.c:304
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:305
+#: sm/gpgsm.c:309
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:312
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:315
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:319
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:323
 msgid "|NAME|use NAME as default recipient"
 msgstr "|MENO|pou�i� MENO ako implicitn�ho adres�ta"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:325
 msgid "use the default key as default recipient"
 msgstr ""
 "pou�i� implicitn� k��� ako implicitn�ho\n"
 " adres�ta"
 
-#: sm/gpgsm.c:338
+#: sm/gpgsm.c:342
 msgid "don't use the terminal at all"
 msgstr "v�bec nepou��va� termin�l"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:346
 msgid "force v3 signatures"
 msgstr "vyn�ti� podpisy verzie 3"
 
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:347
 msgid "always use a MDC for encryption"
 msgstr "na �ifrovanie v�dy pou�i� MDC"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:352
 msgid "batch mode: never ask"
 msgstr "d�vkov� re�im: nikdy sa na ni� nep�ta�"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:353
 msgid "assume yes on most questions"
 msgstr "automaticky odpoveda� �no na v��inu ot�zok"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:354
 msgid "assume no on most questions"
 msgstr "automaticky odpoveda� NIE na v��inu ot�zok"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:356
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 "prida� tento s�bor k���ov do zoznamu\n"
 " pou��van�ch s�borov k���ov"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:357
 msgid "add this secret keyring to the list"
 msgstr "prida� tento s�bor tajn�ch k���ov do zoznamu"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
 msgid "|NAME|use NAME as default secret key"
 msgstr "|MENO|pou�i MENO ako implicitn� tajn� k���"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:359
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 "|PO��TA�|pou�i tento server k���ov na vyh�ad�vanie\n"
 " k���ov"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:360
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|MENO|nastav znakov� sadu termin�lu na MENO"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:364
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:375
+#: sm/gpgsm.c:379
 msgid "|FILE|load extension module FILE"
 msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
 
-#: sm/gpgsm.c:381
+#: sm/gpgsm.c:385
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|ALG|pou�i� �ifrovac� algoritmus ALG"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:387
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|ALG|pou�i� hashovac� algoritmus ALG"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:389
 msgid "|N|use compress algorithm N"
 msgstr "|N|pou�i� kompresn� algoritmus N"
 
-#: sm/gpgsm.c:522
+#: sm/gpgsm.c:528
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: sm/gpgsm.c:525
+#: sm/gpgsm.c:531
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7348,31 +7473,36 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: sm/gpgsm.c:604
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: sm/gpgsm.c:685
+#: sm/gpgsm.c:691
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "nem��em sa pripoji� k `%s': %s\n"
 
-#: sm/gpgsm.c:1237
+#: sm/gpgsm.c:713
+#, fuzzy, c-format
+msgid "unknown validation model `%s'\n"
+msgstr "nezn�my implicitn� adres�t `%s'\n"
+
+#: sm/gpgsm.c:1264
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1316
+#: sm/gpgsm.c:1344
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: sm/gpgsm.c:1334
+#: sm/gpgsm.c:1362
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nem��em zavrie� `%s': %s\n"
 
-#: sm/gpgsm.c:1529
+#: sm/gpgsm.c:1543
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7395,7 +7525,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:375
+#: sm/import.c:541 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
@@ -7479,7 +7609,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234
+#: sm/qualified.c:234 sm/verify.c:536
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7498,30 +7628,37 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
 
-#: sm/verify.c:386
+#: sm/verify.c:388
 #, fuzzy
 msgid "Signature made "
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: sm/verify.c:390
+#: sm/verify.c:392
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:391
-#, c-format
-msgid " using certificate ID %08lX\n"
-msgstr ""
+#: sm/verify.c:393
+#, fuzzy, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: sm/verify.c:507
+#: sm/verify.c:514
 #, fuzzy
 msgid "Good signature from"
 msgstr "Dobr� podpis od \""
 
-#: sm/verify.c:508
+#: sm/verify.c:515
 #, fuzzy
 msgid "                aka"
 msgstr "                alias \""
 
+#: sm/verify.c:533
+#, fuzzy
+msgid "This is a qualified signature\n"
+msgstr ""
+"\n"
+"Ide o podpis k���a n�m sam�m\n"
+
 #: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
@@ -7558,132 +7695,137 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:315
+#: tools/gpg-connect-agent.c:314
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:323
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:382
+#: tools/gpg-connect-agent.c:381
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "riadok je pr�li� dlh�\n"
 
-#: tools/gpg-connect-agent.c:386
+#: tools/gpg-connect-agent.c:385
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:458
+#: tools/gpg-connect-agent.c:457
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
 
-#: tools/gpg-connect-agent.c:466
+#: tools/gpg-connect-agent.c:465
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: tools/gpg-connect-agent.c:474
+#: tools/gpg-connect-agent.c:473
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: tools/gpg-connect-agent.c:784
+#: tools/gpg-connect-agent.c:789
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "chyba pri posielan� na `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:793
+#: tools/gpg-connect-agent.c:798
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "chyba pri posielan� na `%s': %s\n"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
+#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
-#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
+#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
-#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:501
+#: tools/gpgconf-comp.c:492
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:505
+#: tools/gpgconf-comp.c:496
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:509
+#: tools/gpgconf-comp.c:500
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:510
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:638
+#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#, fuzzy
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|MENO|�ifrova� pre MENO"
+
+#: tools/gpgconf-comp.c:635
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:640
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|ALG|pou�i� �ifrovac� algoritmus ALG pre hesl�"
 
-#: tools/gpgconf-comp.c:705
+#: tools/gpgconf-comp.c:708
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:749
+#: tools/gpgconf-comp.c:752
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:785
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:806
+#: tools/gpgconf-comp.c:809
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:814
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:848
+#: tools/gpgconf-comp.c:851
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2681
+#: tools/gpgconf-comp.c:2684
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8302,9 +8444,6 @@ msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 #~ msgid "q"
 #~ msgstr "u"
 
-#~ msgid "help"
-#~ msgstr "help"
-
 #~ msgid "list"
 #~ msgstr "list"
 
diff --git a/po/sv.po b/po/sv.po
index ea19499c6..31d3f4024 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-07-05 18:01+0200\n"
+"POT-Creation-Date: 2007-08-10 15:49+0200\n"
 "PO-Revision-Date: 2007-02-17 13:13+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -38,7 +38,7 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "misslyckades med att ta kontroll över PIN-inmatningslåset: %s\n"
 
-#: agent/call-pinentry.c:426
+#: agent/call-pinentry.c:436
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -46,44 +46,44 @@ msgstr ""
 "Ange din PIN-kod så att den hemliga nyckeln kan låsas upp för den här "
 "sessionen"
 
-#: agent/call-pinentry.c:429
+#: agent/call-pinentry.c:439
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 "Ange din lösenfras så att den hemliga nyckeln kan låsas upp för denna session"
 
-#: agent/call-pinentry.c:476
+#: agent/call-pinentry.c:486
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (försök %d av %d)"
 
-#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
+#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
 msgid "PIN too long"
 msgstr "PIN-koden är för lång"
 
-#: agent/call-pinentry.c:497
+#: agent/call-pinentry.c:507
 msgid "Passphrase too long"
 msgstr "Lösenfrasen är för lång"
 
-#: agent/call-pinentry.c:505
+#: agent/call-pinentry.c:515
 msgid "Invalid characters in PIN"
 msgstr "Ogiltiga tecken i PIN-kod"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:520
 msgid "PIN too short"
 msgstr "PIN-kod för kort"
 
 # MPI står för Multiple Precision Integer (tror jag)
-#: agent/call-pinentry.c:522
+#: agent/call-pinentry.c:532
 msgid "Bad PIN"
 msgstr "Felaktig PIN-kod"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:533
 msgid "Bad Passphrase"
 msgstr "Felaktig lösenfras"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:569
 msgid "Passphrase"
 msgstr "Lösenfras"
 
@@ -101,14 +101,14 @@ msgstr "ssh-nycklar större än %d bitar stöds inte\n"
 msgid "can't create `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
 #: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
-#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1796
+#: sm/gpgsm.c:1833 sm/gpgsm.c:1871 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
@@ -198,32 +198,43 @@ msgstr[1] ""
 msgid "Take this one anyway"
 msgstr "Ta den här ändå"
 
-#: agent/genkey.c:99
+#: agent/genkey.c:99 agent/genkey.c:114
 msgid "Enter new passphrase"
 msgstr "Ange ny lösenfras"
 
+#: agent/genkey.c:107
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+
+#: agent/genkey.c:113
+msgid "Yes, protection is not needed"
+msgstr ""
+
 # fel kapitalisering i originalet?
-#: agent/genkey.c:144
+#: agent/genkey.c:158
 #, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr "Ange lösenfrasen för%0Aför att skydda din nya nyckel"
 
-#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
+#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
 msgid "Please re-enter this passphrase"
 msgstr "Ange denna lösenfras igen"
 
-#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
 #: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr "stämmer inte överens - försök igen"
 
-#: agent/genkey.c:263
+#: agent/genkey.c:280
 msgid "Please enter the new passphrase"
 msgstr "Ange den nya lösenfrasen"
 
 # Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:104
 msgid ""
 "@Options:\n"
 " "
@@ -231,110 +242,110 @@ msgstr ""
 "@Flaggor:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:103
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr "kör i serverläge (förgrund)"
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr "kör i demonläge (bakgrund)"
 
-#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
-#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
 #: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "utförlig"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
-#: sm/gpgsm.c:337
+#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "var något tystare"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:109
+#: agent/gpg-agent.c:118 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr "sh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr "csh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|läs inställningar från FIL"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:119
+#: agent/gpg-agent.c:125 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr "frigör inte från konsollen"
 
-#: agent/gpg-agent.c:125
+#: agent/gpg-agent.c:126
 msgid "do not grab keyboard and mouse"
 msgstr "fånga inte tangentbord och mus"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "använd en loggfil för servern"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:129
 msgid "use a standard location for the socket"
 msgstr "använd en standardplats för uttaget"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PRG|använd PRG som PIN-inmatningsprogrammet"
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PRG|använd PRG som SCdaemon-programmet"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 msgid "do not use the SCdaemon"
 msgstr "använd inte SCdaemon"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "ignore requests to change the TTY"
 msgstr "ignorera begäran om att ändra TTY"
 
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:145
 msgid "ignore requests to change the X display"
 msgstr "ignorera begäran om att ändra X-display"
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|låt mellanlagrad PIN-koder gå ut efter N sekunder"
 
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr "använd inte mellanlagring av PIN-kod vid signering"
 
 # Antar att värdet inte ska översättas.
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "tillåt klienter att markera nycklar som \"trusted\""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:158
 msgid "allow presetting passphrase"
 msgstr "tillåt förinställning av lösenfras"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr "aktivera ssh-agent-emulering"
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|FIL|skriv miljöinställningar även till FIL"
 
-#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:206 sm/gpgsm.c:525 tools/gpg-connect-agent.c:124
 #: tools/gpgconf.c:89 tools/symcryptrun.c:204
 msgid "Please report bugs to <"
 msgstr "Rapportera fel till <"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:260
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Användning: gpg-agent [flaggor] (-h för hjälp)"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:262
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -342,131 +353,131 @@ msgstr ""
 "Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
 "Hantering av hemliga nycklar för GnuPG\n"
 
-#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
+#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "ogiltig debug-level \"%s\" angiven\n"
 
-#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
-#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:340 sm/gpgsm.c:772 sm/gpgsm.c:775 tools/symcryptrun.c:1026
 #, fuzzy, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "libksba är för gammal (behöver %s, har %s)\n"
 
-#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
+#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:863
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBS: inställningsfilen \"%s\" saknas\n"
 
-#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
-#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: scd/scdaemon.c:421 sm/gpgsm.c:867 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
+#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:874
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
 
-#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Fel när \"%s\" skapades: %s\n"
 
-#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
-#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:921
+#: agent/gpg-agent.c:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
+#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:908
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan inte skapa katalog: %s\n"
 
-#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
+#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr "namnet på uttaget är för långt\n"
 
-#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan inte skapa uttag: %s\n"
 
-#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "ingen gpg-agent kör i den här sessionen\n"
 
-#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
+#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "fel när \"%s\" bands till uttag: %s\n"
 
-#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
+#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() misslyckades: %s\n"
 
-#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "lyssnar på uttaget \"%s\"\n"
 
-#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
+#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen \"%s\" skapades\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1377
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() misslyckades för \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1381
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "kan inte använda \"%s\" som hemkatalog\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "hanteraren 0x%lx för fd %d startad\n"
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1497
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "hanteraren 0x%lx för fd %d avslutad\n"
 
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh-hanteraren 0x%lx för fd %d startad\n"
 
-#: agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1519
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh-hanteraren 0x%lx för fd %d avslutad\n"
 
-#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
+#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select misslyckades: %s - väntar 1 s\n"
 
-#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
+#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppad\n"
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1752
 msgid "no gpg-agent running in this session\n"
 msgstr "ingen gpg-agent kör i den här sessionen\n"
 
-#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:751
+#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n"
 
-#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
-#: tools/gpg-connect-agent.c:762
+#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "GPG-Agent protokoll version %d stöds inte\n"
@@ -533,42 +544,42 @@ msgstr "fel vid fråga efter lösenfrasen: %s\n"
 msgid "cancelled\n"
 msgstr "avbruten\n"
 
-#: agent/trustlist.c:131 agent/trustlist.c:319
+#: agent/trustlist.c:132 agent/trustlist.c:322
 #, c-format
 msgid "error opening `%s': %s\n"
 msgstr "fel vid öppnandet av \"%s\": %s\n"
 
-#: agent/trustlist.c:146
+#: agent/trustlist.c:147
 #, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "fil \"%s\", rad %d: %s\n"
 
-#: agent/trustlist.c:166 agent/trustlist.c:174
+#: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr "uttrycket \"%s\" ignorerat i \"%s\", rad %d\n"
 
-#: agent/trustlist.c:180
+#: agent/trustlist.c:181
 #, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "systemets tillitslista \"%s\" är inte tillgänglig\n"
 
-#: agent/trustlist.c:215
+#: agent/trustlist.c:216
 #, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "felaktigt fingeravtryck i \"%s\", rad %d\n"
 
-#: agent/trustlist.c:241 agent/trustlist.c:248
+#: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr "ogiltig nyckelflagga i \"%s\", rad %d\n"
 
-#: agent/trustlist.c:280
+#: agent/trustlist.c:283
 #, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "fel vid läsning av \"%s\", rad %d: %s\n"
 
-#: agent/trustlist.c:381 agent/trustlist.c:420
+#: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
 msgstr "fel vid inläsning av betrodda rotcertifikat\n"
 
@@ -581,7 +592,7 @@ msgstr "fel vid inläsning av betrodda rotcertifikat\n"
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:496
+#: agent/trustlist.c:507
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -593,7 +604,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:505
+#: agent/trustlist.c:516
 msgid "Correct"
 msgstr "Korrekt"
 
@@ -605,7 +616,7 @@ msgstr "Korrekt"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:525
+#: agent/trustlist.c:536
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -614,51 +625,51 @@ msgstr ""
 "Litar du förbehållslöst på%%0A  \"%s\"%%0Aatt korrekt certifiera "
 "användarcertifikat?"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "No"
 msgstr "Nej"
 
-#: common/exechelp.c:302 common/exechelp.c:393
+#: common/exechelp.c:302 common/exechelp.c:390
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "fel när ett rör skapades: %s\n"
 
 # se förra kommentaren
-#: common/exechelp.c:369 common/exechelp.c:426
+#: common/exechelp.c:366 common/exechelp.c:423
 #, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "kan inte fdopen rör för läsning: %s\n"
 
-#: common/exechelp.c:405 common/exechelp.c:635
+#: common/exechelp.c:402 common/exechelp.c:632
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "fel vid grening av process: %s\n"
 
-#: common/exechelp.c:461 common/exechelp.c:504
+#: common/exechelp.c:458 common/exechelp.c:501
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "misslyckades med att vänta på att processen %d skulle avslutas: %s\n"
 
-#: common/exechelp.c:469
+#: common/exechelp.c:466
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "fel vid hämtning av avslutskod för processen %d: %s\n"
 
-#: common/exechelp.c:475 common/exechelp.c:515
+#: common/exechelp.c:472 common/exechelp.c:512
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "fel vid körning av \"%s\": avslutsstatus %d\n"
 
-#: common/exechelp.c:510
+#: common/exechelp.c:507
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr "fel vid körning av \"%s\": antagligen inte installerat\n"
 
-#: common/exechelp.c:521
+#: common/exechelp.c:518
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "fel vid körning av \"%s\": avslutades\n"
@@ -676,24 +687,24 @@ msgstr "värden hittades inte"
 msgid "gpg-agent is not available in this session\n"
 msgstr "kunde inte få tillgång till GPG-Agent i denna session\n"
 
-#: common/simple-pwquery.c:376
+#: common/simple-pwquery.c:373
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan inte ansluta till \"%s\": %s\n"
 
-#: common/simple-pwquery.c:387
+#: common/simple-pwquery.c:384
 msgid "communication problem with gpg-agent\n"
 msgstr "kommunikationsproblem med gpg-agent\n"
 
-#: common/simple-pwquery.c:397
+#: common/simple-pwquery.c:394
 msgid "problem setting the gpg-agent options\n"
 msgstr "inställningsproblem för gpg-agent\n"
 
-#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+#: common/simple-pwquery.c:557 common/simple-pwquery.c:653
 msgid "canceled by user\n"
 msgstr "avbruten av användaren\n"
 
-#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+#: common/simple-pwquery.c:572 common/simple-pwquery.c:659
 msgid "problem with the agent\n"
 msgstr "problem med agenten\n"
 
@@ -876,7 +887,7 @@ msgstr "VARNING: ogiltig notationsdata hittades\n"
 msgid "not human readable"
 msgstr "inte läsbart"
 
-#: g10/card-util.c:62 g10/card-util.c:305
+#: g10/card-util.c:62 g10/card-util.c:308
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP-kort är inte tillgängligt: %s\n"
@@ -886,153 +897,153 @@ msgstr "OpenPGP-kort är inte tillgängligt: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP-kort nr. %s identifierades\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1391 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "kan inte göra detta i satsläge\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
 #: g10/keygen.c:1644
 msgid "Your selection? "
 msgstr "Vad väljer du? "
 
-#: g10/card-util.c:215 g10/card-util.c:265
+#: g10/card-util.c:218 g10/card-util.c:268
 msgid "[not set]"
 msgstr "[inte inställt]"
 
-#: g10/card-util.c:412
+#: g10/card-util.c:415
 msgid "male"
 msgstr "man"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "female"
 msgstr "kvinna"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "unspecified"
 msgstr "ej angiven"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "not forced"
 msgstr "inte tvingad"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "forced"
 msgstr "tvingad"
 
-#: g10/card-util.c:518
+#: g10/card-util.c:521
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Fel: Endast ren ASCII tillåts för närvarande.\n"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:523
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fel: Tecknet \"<\" får inte användas.\n"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:525
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fel: Dubbla blanksteg tillåts inte.\n"
 
-#: g10/card-util.c:539
+#: g10/card-util.c:542
 msgid "Cardholder's surname: "
 msgstr "Kortinnehavarens efternamn: "
 
-#: g10/card-util.c:541
+#: g10/card-util.c:544
 msgid "Cardholder's given name: "
 msgstr "Kortinnehavarens förnamn: "
 
-#: g10/card-util.c:559
+#: g10/card-util.c:562
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Fel: Fullständigt namn för långt (gränsen är %d tecken).\n"
 
-#: g10/card-util.c:580
+#: g10/card-util.c:583
 msgid "URL to retrieve public key: "
 msgstr "Url för att hämta publik nyckel: "
 
-#: g10/card-util.c:588
+#: g10/card-util.c:591
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Fel: URL:en är för lång (gränsen är %d tecken).\n"
 
-#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
+#: g10/card-util.c:689 g10/card-util.c:758 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
 
-#: g10/card-util.c:694
+#: g10/card-util.c:697
 msgid "Login data (account name): "
 msgstr "Inloggningsdata (kontonamn): "
 
-#: g10/card-util.c:704
+#: g10/card-util.c:707
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Fel: Inloggningsdata är för långt (gräns är %d tecken).\n"
 
-#: g10/card-util.c:763
+#: g10/card-util.c:766
 msgid "Private DO data: "
 msgstr "Privat DO-data: "
 
-#: g10/card-util.c:773
+#: g10/card-util.c:776
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Fel: Privat DO för långt (gränsen är %d tecken).\n"
 
-#: g10/card-util.c:793
+#: g10/card-util.c:796
 msgid "Language preferences: "
 msgstr "Språkinställningar: "
 
-#: g10/card-util.c:801
+#: g10/card-util.c:804
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fel: ogiltig längd på inställningssträngen\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:813
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fel: ogiltiga tecken i inställningssträngen.\n"
 
-#: g10/card-util.c:831
+#: g10/card-util.c:834
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Kön ((M)an, Kvinna(F) eller blanksteg): "
 
-#: g10/card-util.c:845
+#: g10/card-util.c:848
 msgid "Error: invalid response.\n"
 msgstr "Fel: ogiltigt svar.\n"
 
-#: g10/card-util.c:866
+#: g10/card-util.c:869
 msgid "CA fingerprint: "
 msgstr "CA-fingeravtryck: "
 
-#: g10/card-util.c:889
+#: g10/card-util.c:892
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fel: ogiltigt formaterat fingeravtryck.\n"
 
-#: g10/card-util.c:937
+#: g10/card-util.c:940
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "nyckelåtgärden är inte möjlig: %s\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:941
 msgid "not an OpenPGP card"
 msgstr "inte ett OpenPGP-kort"
 
-#: g10/card-util.c:947
+#: g10/card-util.c:950
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fel vid hämtning av aktuell nyckelinformation: %s\n"
 
-#: g10/card-util.c:1031
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr "Ersätt existerande nyckel? (j/N) "
 
-#: g10/card-util.c:1051 g10/card-util.c:1060
+#: g10/card-util.c:1054 g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Skapa säkerhetskopia av krypteringsnyckel utanför kortet? (J/n) "
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1075
 msgid "Replace existing keys? (y/N) "
 msgstr "Ersätt existerande nycklar? (j/N) "
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1084
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1043,122 +1054,122 @@ msgstr ""
 "   PIN-kod = \"%s\"     Admin PIN-kod = \"%s\"\n"
 "Du bör ändra dem med kommandot --change-pin\n"
 
-#: g10/card-util.c:1115
+#: g10/card-util.c:1118
 msgid "Please select the type of key to generate:\n"
 msgstr "Välj vilken typ av nyckel som ska genereras:\n"
 
-#: g10/card-util.c:1117 g10/card-util.c:1194
+#: g10/card-util.c:1120 g10/card-util.c:1197
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signeringsnyckel\n"
 
-#: g10/card-util.c:1118 g10/card-util.c:1196
+#: g10/card-util.c:1121 g10/card-util.c:1199
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsnyckel\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1198
+#: g10/card-util.c:1122 g10/card-util.c:1201
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsnyckel\n"
 
-#: g10/card-util.c:1135 g10/card-util.c:1214 g10/keyedit.c:945
+#: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
 #: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ogiltigt val.\n"
 
-#: g10/card-util.c:1191
+#: g10/card-util.c:1194
 msgid "Please select where to store the key:\n"
 msgstr "Välj var nyckeln ska sparas:\n"
 
-#: g10/card-util.c:1226
+#: g10/card-util.c:1229
 msgid "unknown key protection algorithm\n"
 msgstr "okänd nyckelskyddsalgoritm\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1234
 msgid "secret parts of key are not available\n"
 msgstr "hemliga delar av nyckeln är inte tillgängliga.\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1239
 msgid "secret key already stored on a card\n"
 msgstr "hemlig nyckel redan lagrad på ett kort\n"
 
-#: g10/card-util.c:1304 g10/keyedit.c:1362
+#: g10/card-util.c:1307 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1309
 msgid "show admin commands"
 msgstr "visa administratörskommandon"
 
-#: g10/card-util.c:1307 g10/keyedit.c:1365
+#: g10/card-util.c:1310 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "visa denna hjälp"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1312
 msgid "list all available data"
 msgstr "lista allt tillgängligt data"
 
-#: g10/card-util.c:1312
+#: g10/card-util.c:1315
 msgid "change card holder's name"
 msgstr "ändra kortinnehavarens namn"
 
-#: g10/card-util.c:1313
+#: g10/card-util.c:1316
 msgid "change URL to retrieve key"
 msgstr "ändra url för att hämta nyckel"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1317
 msgid "fetch the key specified in the card URL"
 msgstr "hämta nyckel som anges i kortets url"
 
-#: g10/card-util.c:1315
+#: g10/card-util.c:1318
 msgid "change the login name"
 msgstr "ändra inloggningsnamnet"
 
 # originalet borde ha ett value
-#: g10/card-util.c:1316
+#: g10/card-util.c:1319
 msgid "change the language preferences"
 msgstr "ändra språkinställningarna"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1320
 msgid "change card holder's sex"
 msgstr "ändra kortinnehavarens kön"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1321
 msgid "change a CA fingerprint"
 msgstr "ändra ett CA-fingeravtryck"
 
 # den låter skum
-#: g10/card-util.c:1319
+#: g10/card-util.c:1322
 msgid "toggle the signature force PIN flag"
 msgstr "växla flagga för att tvinga signatur-PIN-kod"
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1323
 msgid "generate new keys"
 msgstr "generera nya nycklar"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1324
 msgid "menu to change or unblock the PIN"
 msgstr "meny för att ändra eller avblockera PIN-koden"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1325
 msgid "verify the PIN and list all data"
 msgstr "validera PIN-koden och lista allt data"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1634
+#: g10/card-util.c:1445 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/card-util.c:1480
+#: g10/card-util.c:1483
 msgid "Admin-only command\n"
 msgstr "Kommandon endast för administratör\n"
 
-#: g10/card-util.c:1511
+#: g10/card-util.c:1514
 msgid "Admin commands are allowed\n"
 msgstr "Administrationskommandon tillåts\n"
 
-#: g10/card-util.c:1513
+#: g10/card-util.c:1516
 msgid "Admin commands are not allowed\n"
 msgstr "Administrationskommandon tillåts inte\n"
 
-#: g10/card-util.c:1587 g10/keyedit.c:2255
+#: g10/card-util.c:1590 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ogiltigt kommando (försök med \"help\")\n"
 
@@ -1167,7 +1178,7 @@ msgid "--output doesn't work for this command\n"
 msgstr "--output kan inte användas för detta kommando\n"
 
 # se förra kommentaren
-#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
@@ -1467,7 +1478,7 @@ msgstr "använder undernyckeln %s istället för primära nyckeln %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "nyckel %s: hemlig nyckel utan publik nyckel - hoppades över\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1483,28 +1494,28 @@ msgstr "|[fil]|skapa en signatur"
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartextsignatur"
 
-#: g10/gpg.c:372 sm/gpgsm.c:244
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "skapa signatur i en separat fil"
 
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/gpg.c:375 sm/gpgsm.c:246
+#: g10/gpg.c:375 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "endast symmetrisk kryptering"
 
 # gnupg dekrypterar data om inget kommando anges dvs. kommandot "decrypt" behöver inte användas.
-#: g10/gpg.c:377 sm/gpgsm.c:247
+#: g10/gpg.c:377 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "dekryptera data (standard)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:248
+#: g10/gpg.c:379 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "validera en signatur"
 
-#: g10/gpg.c:381 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "lista nycklar"
 
@@ -1516,11 +1527,11 @@ msgstr "lista nycklar och signaturer"
 msgid "list and check key signatures"
 msgstr "lista och kontrollera nyckelsignaturer"
 
-#: g10/gpg.c:385 sm/gpgsm.c:254
+#: g10/gpg.c:385 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "lista nycklar och fingeravtryck"
 
-#: g10/gpg.c:386 sm/gpgsm.c:252
+#: g10/gpg.c:386 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "lista hemliga nycklar"
 
@@ -1556,11 +1567,11 @@ msgstr "generera ett spärrcertifikat"
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/gpg.c:397 sm/gpgsm.c:257
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "importera nycklar från en nyckelserver"
 
@@ -1596,12 +1607,12 @@ msgstr "uppdatera tillitsdatabasen"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
-#: g10/gpg.c:430 sm/gpgsm.c:262
+#: g10/gpg.c:430 sm/gpgsm.c:264
 msgid "run in server mode"
 msgstr "kör i serverläge"
 
 # Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
 #: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1612,31 +1623,31 @@ msgstr ""
 "Flaggor:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:279
+#: g10/gpg.c:434 sm/gpgsm.c:281
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/gpg.c:436 sm/gpgsm.c:291
+#: g10/gpg.c:436 sm/gpgsm.c:293
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera för NAMN"
 
-#: g10/gpg.c:447 sm/gpgsm.c:327
+#: g10/gpg.c:447 sm/gpgsm.c:331
 msgid "use this user-id to sign or decrypt"
 msgstr "använd denna användaridentitet för att signera eller dekryptera"
 
-#: g10/gpg.c:448 sm/gpgsm.c:330
+#: g10/gpg.c:448 sm/gpgsm.c:334
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|ställ in komprimeringsnivån till N (0 för att inaktivera)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:332
+#: g10/gpg.c:453 sm/gpgsm.c:336
 msgid "use canonical text mode"
 msgstr "använd \"ursprunglig text\"-läget"
 
-#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "använd som fil för utdata"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
@@ -1654,7 +1665,7 @@ msgstr "generera PGP 2.x-kompatibla meddelanden"
 
 # inställningar istället för flaggor?
 # Nej, här är det bruksanvisningen för kommandoraden.
-#: g10/gpg.c:553 sm/gpgsm.c:393
+#: g10/gpg.c:553 sm/gpgsm.c:397
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1662,7 +1673,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:396
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1703,7 +1714,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:532
+#: g10/gpg.c:781 sm/gpgsm.c:538
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1731,7 +1742,7 @@ msgstr "Komprimering: "
 msgid "usage: gpg [options] "
 msgstr "användning: gpg [flaggor] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:669
+#: g10/gpg.c:1045 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
@@ -1817,460 +1828,460 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "okänd konfigurationspost \"%s\"\n"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr "visa foto-id under nyckellistning"
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr "visa policy-url:er under signaturlistningar"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1544
 msgid "show all notations during signature listings"
 msgstr "visa alla notationer under signaturlistningar"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr "visa IETF-standardnotationer under signaturlistningar"
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr "visa användarangivna notationer under signaturlistningar"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1552
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "visa url:er till föredragna nyckelservrar under signaturlistningar"
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr "visa giltighet för användaridentitet vid nyckellistningar "
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1560
 msgid "show the keyring name in key listings"
 msgstr "visa nyckelringens namn i nyckellistningar"
 
-#: g10/gpg.c:1564
+#: g10/gpg.c:1562
 msgid "show expiration dates during signature listings"
 msgstr "visa utgångsdatum under signaturlistningar"
 
-#: g10/gpg.c:1827
+#: g10/gpg.c:1825
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt är för gammalt (behöver %s, har %s)\n"
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1981
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n"
 
-#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
+#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "OBS: %s är inte för normal användning!\n"
 
-#: g10/gpg.c:2401 g10/gpg.c:2413
+#: g10/gpg.c:2399 g10/gpg.c:2411
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "\"%s\" är inte ett giltigt utgångsdatum för en signatur\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2493
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "\"%s\" är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4084
+#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka url till nyckelserver\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2528
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2531
 msgid "invalid keyserver options\n"
 msgstr "ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2538
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ogiltiga importeringsflaggor\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2541
 msgid "invalid import options\n"
 msgstr "ogiltiga importflaggor\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2548
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ogiltiga exportflaggor\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2551
 msgid "invalid export options\n"
 msgstr "ogiltiga exportinställningar\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2558
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ogiltiga listflaggor\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2561
 msgid "invalid list options\n"
 msgstr "ogiltiga listflaggor\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2569
 msgid "display photo IDs during signature verification"
 msgstr "visa foto-id under signaturvalidering"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2571
 msgid "show policy URLs during signature verification"
 msgstr "visa policy-url:er under signaturvalidering"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2573
 msgid "show all notations during signature verification"
 msgstr "visa alla notationer under signaturvalidering"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2575
 msgid "show IETF standard notations during signature verification"
 msgstr "visa IETF-standardnotationer under signaturvalidering"
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2579
 msgid "show user-supplied notations during signature verification"
 msgstr "visa användarangivna notationer under signaturvalidering"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2581
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "visa url:er till föredragna nyckelserver under signaturvalidering"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2583
 msgid "show user ID validity during signature verification"
 msgstr "visa giltighet för användaridentitet vid signaturvalidering"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2585
 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
+#: g10/gpg.c:2587
 #, 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
+#: g10/gpg.c:2589
 msgid "validate signatures with PKA data"
 msgstr "validera signaturer med PKA-data"
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2591
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "öka tillit på signaturer med giltigt PKA-data"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2598
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2601
 msgid "invalid verify options\n"
 msgstr "ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2608
 #, 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:2784
+#: g10/gpg.c:2782
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
 
-#: g10/gpg.c:2787
+#: g10/gpg.c:2785
 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:2873 sm/gpgsm.c:1220
+#: g10/gpg.c:2871 sm/gpgsm.c:1247
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2875
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2884
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2887
 #, 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:2904
+#: g10/gpg.c:2902
 #, 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:2918
+#: g10/gpg.c:2916
 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:2924
+#: g10/gpg.c:2922
 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:2930
+#: g10/gpg.c:2928
 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:2943
+#: g10/gpg.c:2941
 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:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
+#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1303
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen är ogiltig\n"
 
-#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
+#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1311
 msgid "selected digest algorithm is invalid\n"
 msgstr "vald sammandragsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "selected compression algorithm is invalid\n"
 msgstr "vald komprimeringsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3025
 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:3042
+#: g10/gpg.c:3040
 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:3044
+#: g10/gpg.c:3042
 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:3046
+#: g10/gpg.c:3044
 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:3048
+#: g10/gpg.c:3046
 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:3050
+#: g10/gpg.c:3048
 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:3053
+#: g10/gpg.c:3051
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/gpg.c:3057
+#: g10/gpg.c:3055
 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:3064
+#: g10/gpg.c:3062
 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:3073
+#: g10/gpg.c:3071
 msgid "invalid personal cipher preferences\n"
 msgstr "ogiltig inställning av föredragna krypteringsalgoritmer\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3075
 msgid "invalid personal digest preferences\n"
 msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3079
 msgid "invalid personal compress preferences\n"
 msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
 
-#: g10/gpg.c:3114
+#: g10/gpg.c:3112
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3159
 #, 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:3166
+#: g10/gpg.c:3164
 #, 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:3171
+#: g10/gpg.c:3169
 #, 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:3263
+#: g10/gpg.c:3261
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3272
 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:3295
+#: g10/gpg.c:3293
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3300
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3302
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av \"%s\" misslyckades: %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3312
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3325
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnamn]"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3327
 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:3332
+#: g10/gpg.c:3330
 #, 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:3350
+#: g10/gpg.c:3348
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3361
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3376
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3378
 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:3383
+#: g10/gpg.c:3381
 #, 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:3403
+#: g10/gpg.c:3401
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3410
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3435
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3443
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3447
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3468
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3553
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3557
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export av nyckeln misslyckades: %s\n"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3568
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3580
+#: g10/gpg.c:3578
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/gpg.c:3631
+#: g10/gpg.c:3629
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/gpg.c:3639
+#: g10/gpg.c:3637
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/gpg.c:3729
+#: g10/gpg.c:3727
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3844
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/gpg.c:3850
+#: g10/gpg.c:3848
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4160
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4162
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4195
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
 
@@ -2285,7 +2296,7 @@ msgstr "ta nycklarna från denna nyckelring "
 msgid "make timestamp conflicts only a warning"
 msgstr "utfärda enbart en varning när tidsstämpeln är orimlig"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:368
+#: g10/gpgv.c:75 sm/gpgsm.c:372
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
@@ -6737,43 +6748,43 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\n"
 
-#: scd/scdaemon.c:105
+#: scd/scdaemon.c:108
 msgid "run in multi server mode (foreground)"
 msgstr "kör i multiserverläge (förgrund)"
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:357
+#: scd/scdaemon.c:114 sm/gpgsm.c:361
 msgid "read options from file"
 msgstr "läs inställningar från fil"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:124
 msgid "|N|connect to reader at port N"
 msgstr "|N|anslut till läsare på port N"
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAMN|använd NAMN som ct-API-drivrutin"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:126
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAMN|använd NAMN som PC/SC-drivrutin"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:129
 msgid "do not use the internal CCID driver"
 msgstr "använd inte den interna CCID-drivrutinen"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:134
 msgid "do not use a reader's keypad"
 msgstr "använd inte läsarens knappsats"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:135
 msgid "allow the use of admin card commands"
 msgstr "tillåt användning av administratörskommandon för kort"
 
-#: scd/scdaemon.c:206
+#: scd/scdaemon.c:209
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Användning: scdaemon [flaggor] (-h för hjälp)"
 
-#: scd/scdaemon.c:208
+#: scd/scdaemon.c:211
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6781,16 +6792,16 @@ msgstr ""
 "Syntax: scdaemon [flaggor] [kommando [argument]]\n"
 "Smartkortsdemon för GnuPG\n"
 
-#: scd/scdaemon.c:671
+#: scd/scdaemon.c:658
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr "använd flaggan \"--daemon\" för att köra programmet i bakgrunden\n"
 
-#: scd/scdaemon.c:1019
+#: scd/scdaemon.c:1006
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "hanterare för fd %d startad\n"
 
-#: scd/scdaemon.c:1024
+#: scd/scdaemon.c:1011
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "hanterare för fd %d avslutad\n"
@@ -6819,135 +6830,251 @@ msgstr "dirmngr-protokoll version %d stöds inte\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr "kan inte ansluta till dirmngr - försöker falla tillbaka\n"
 
-#: sm/certchain.c:174
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr ""
+
+#: sm/certchain.c:195
+msgid "chain"
+msgstr ""
+
+#: sm/certchain.c:196
+msgid "shell"
+msgstr ""
+
+#: sm/certchain.c:241
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "kritiska certifikattillägget %s stöds inte"
 
-#: sm/certchain.c:212
+#: sm/certchain.c:279
 msgid "issuer certificate is not marked as a CA"
 msgstr "utfärdarens certifikat är inte markerat som en CA"
 
-#: sm/certchain.c:250
+#: sm/certchain.c:317
 msgid "critical marked policy without configured policies"
 msgstr "kritisk markerad policy utan konfigurerade policier"
 
-#: sm/certchain.c:260
+#: sm/certchain.c:327
 #, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "misslyckades med att öppna \"%s\": %s\n"
 
-#: sm/certchain.c:267 sm/certchain.c:296
+#: sm/certchain.c:334 sm/certchain.c:363
 msgid "note: non-critical certificate policy not allowed"
 msgstr "observera: icke-kritisk certifikatpolicy tillåts inte"
 
-#: sm/certchain.c:271 sm/certchain.c:300
+#: sm/certchain.c:338 sm/certchain.c:367
 msgid "certificate policy not allowed"
 msgstr "certifikatpolicy tillåts inte"
 
-#: sm/certchain.c:411
+#: sm/certchain.c:478
 msgid "looking up issuer at external location\n"
 msgstr "slår upp utfärdare på extern plats\n"
 
-#: sm/certchain.c:431
+#: sm/certchain.c:498
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "antal utfärdare som matchar: %d\n"
 
-#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
 msgid "failed to allocated keyDB handle\n"
 msgstr "misslyckades med att allokera keyDB-hanterare\n"
 
-#: sm/certchain.c:675
+#: sm/certchain.c:742
 msgid "certificate has been revoked"
 msgstr "certifikatet har spärrats"
 
-#: sm/certchain.c:684
+#: sm/certchain.c:752
 msgid "no CRL found for certificate"
 msgstr "ingen spärrlista hittades för certifikatet"
 
-#: sm/certchain.c:688
+#: sm/certchain.c:757
+msgid "the status of the certificate is unknown"
+msgstr ""
+
+#: sm/certchain.c:762
 msgid "the available CRL is too old"
 msgstr "den tillgängliga spärrlistan är för gammal"
 
-#: sm/certchain.c:690
+#: sm/certchain.c:764
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "se till att \"dirmngr\" är korrekt installerat\n"
 
-#: sm/certchain.c:695
+#: sm/certchain.c:770
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontroll mot spärrlistan misslyckades: %s"
 
-#: sm/certchain.c:791
-msgid "no issuer found in certificate"
-msgstr "ingen utfärdare hittades i certifikatet"
-
-#: sm/certchain.c:820
+#: sm/certchain.c:799 sm/certchain.c:867
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certifikat med felaktig giltighetstid: %s"
 
-#: sm/certchain.c:836
+#: sm/certchain.c:814 sm/certchain.c:899
 msgid "certificate not yet valid"
 msgstr "certifikatet är ännu inte giltigt"
 
-#: sm/certchain.c:849
+#: sm/certchain.c:815 sm/certchain.c:900
+#, fuzzy
+msgid "root certificate not yet valid"
+msgstr "certifikatet är ännu inte giltigt"
+
+#: sm/certchain.c:816 sm/certchain.c:901
+#, fuzzy
+msgid "intermediate certificate not yet valid"
+msgstr "certifikatet är ännu inte giltigt"
+
+#: sm/certchain.c:829
 msgid "certificate has expired"
 msgstr "certifikatet har gått ut"
 
-#: sm/certchain.c:892
-msgid "self-signed certificate has a BAD signature"
-msgstr "självsignerat certifikat har en FELAKTIG signatur"
+#: sm/certchain.c:830
+#, fuzzy
+msgid "root certificate has expired"
+msgstr "certifikatet har gått ut"
 
-#: sm/certchain.c:960
-msgid "root certificate is not marked trusted"
-msgstr "rotcertifikatet har inte markerats som betrott"
+#: sm/certchain.c:831
+#, fuzzy
+msgid "intermediate certificate has expired"
+msgstr "certifikatet har gått ut"
+
+#: sm/certchain.c:873
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
+msgstr ""
+
+#: sm/certchain.c:882
+#, fuzzy
+msgid "certificate with invalid validity"
+msgstr "certifikat med felaktig giltighetstid: %s"
+
+#: sm/certchain.c:919
+#, fuzzy
+msgid "signature not created during lifetime of certificate"
+msgstr "fel vid inläsning av betrodda rotcertifikat\n"
+
+#: sm/certchain.c:921
+msgid "certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:922
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:926
+#, fuzzy
+msgid "  (  signature created at "
+msgstr "             signaturer rensade: %lu\n"
+
+#: sm/certchain.c:927
+#, fuzzy
+msgid "  (certificate created at "
+msgstr "Spärrcertifikat skapat.\n"
+
+#: sm/certchain.c:930
+#, fuzzy
+msgid "  (certificate valid from "
+msgstr "certifikatet är ännu inte giltigt"
+
+#: sm/certchain.c:931
+#, fuzzy
+msgid "  (     issuer valid from "
+msgstr "       Kortets serienr ="
 
-#: sm/certchain.c:975
+#: sm/certchain.c:961
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "fingeravtryck=%s\n"
 
-#: sm/certchain.c:983
+#: sm/certchain.c:970
 msgid "root certificate has now been marked as trusted\n"
 msgstr "rotcertifikatet har nu markerats som betrott\n"
 
-#: sm/certchain.c:998
+#: sm/certchain.c:983
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "interaktiv markering som betrodd inte aktiverad i gpg-agent\n"
 
-#: sm/certchain.c:1004
+#: sm/certchain.c:989
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "interaktiv markering som betrodd inaktiverad för den här sessionen\n"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1046
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr ""
+
+#: sm/certchain.c:1110
+msgid "no issuer found in certificate"
+msgstr "ingen utfärdare hittades i certifikatet"
+
+#: sm/certchain.c:1184
+msgid "self-signed certificate has a BAD signature"
+msgstr "självsignerat certifikat har en FELAKTIG signatur"
+
+#: sm/certchain.c:1253
+msgid "root certificate is not marked trusted"
+msgstr "rotcertifikatet har inte markerats som betrott"
+
+#: sm/certchain.c:1266
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontroll mot tillitslistan misslyckades: %s\n"
 
-#: sm/certchain.c:1041 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr "certifikatkedjan är för lång\n"
 
-#: sm/certchain.c:1053
+#: sm/certchain.c:1307
 msgid "issuer certificate not found"
 msgstr "utfärdarens certifikat hittades inte"
 
-#: sm/certchain.c:1086
+#: sm/certchain.c:1340
 msgid "certificate has a BAD signature"
 msgstr "certifikatet har en FELAKTIG signatur"
 
-#: sm/certchain.c:1116
+#: sm/certchain.c:1371
 msgid "found another possible matching CA certificate - trying again"
 msgstr "hittade ett annat möjligen matchande CA-certifikat - försöker igen"
 
-#: sm/certchain.c:1167
+#: sm/certchain.c:1422
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "certifikatkedjan längre än vad som tillåts av CA (%d)"
 
+#: sm/certchain.c:1462 sm/certchain.c:1730
+#, fuzzy
+msgid "certificate is good\n"
+msgstr "certifikatkedjan är för lång\n"
+
+#: sm/certchain.c:1463
+#, fuzzy
+msgid "intermediate certificate is good\n"
+msgstr "dubblett av certifikatet \"%s\" borttaget\n"
+
+#: sm/certchain.c:1464
+#, fuzzy
+msgid "root certificate is good\n"
+msgstr "rotcertifikatet har inte markerats som betrott"
+
+#: sm/certchain.c:1620
+msgid "switching to chain model"
+msgstr ""
+
+#: sm/certchain.c:1629
+#, c-format
+msgid "validation model used: %s"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "chain model"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "shell model"
+msgstr ""
+
 #: sm/certcheck.c:101
 #, fuzzy, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
@@ -6987,11 +7114,11 @@ msgid "[Error - invalid DN]"
 msgstr "[Fel - ogiltigt DN]"
 
 #: sm/certdump.c:936
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
 "\"%s\"\n"
-"S/N %s, ID %08lX, created %s"
+"S/N %s, ID 0x%08lX, created %s"
 msgstr ""
 "Ange lösenfrasen för att låsa upp den hemliga nyckeln för:\n"
 "\"%s\"\n"
@@ -7001,7 +7128,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr "ingen nyckelanvändning angiven - antar alla användningsområden\n"
 
-#: sm/certlist.c:131 sm/keylist.c:255
+#: sm/certlist.c:131 sm/keylist.c:258
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "fel vid hämtning av nyckelanvändningsinformation: %s\n"
@@ -7124,172 +7251,172 @@ msgstr "fel när temporärfil skapades: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "fel vid skrivning till temporärfil: %s\n"
 
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:244
 msgid "|[FILE]|make a signature"
 msgstr "|[FIL]|skapa en signatur"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:245
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[FIL]|skapa en klartext-signatur"
 
-#: sm/gpgsm.c:251
+#: sm/gpgsm.c:253
 msgid "list external keys"
 msgstr "lista externa nycklar"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 msgid "list certificate chain"
 msgstr "lista certifikatkedja"
 
-#: sm/gpgsm.c:256
+#: sm/gpgsm.c:258
 msgid "remove key from the public keyring"
 msgstr "ta bort nyckel från den publika nyckelringen"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:261
 msgid "import certificates"
 msgstr "importera certifikat"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:262
 msgid "export certificates"
 msgstr "exportera certifikat"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 msgid "register a smartcard"
 msgstr "registrera ett smartkort"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "pass a command to the dirmngr"
 msgstr "skicka ett kommando till dirmngr"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "invoke gpg-protect-tool"
 msgstr "starta gpg-protect-tool"
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:268
 msgid "change a passphrase"
 msgstr "ändra en lösenfras"
 
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
 msgid "create base-64 encoded output"
 msgstr "skapa base-64-kodat utdata"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:287
 msgid "assume input is in PEM format"
 msgstr "anta att inmatning är i PEM-format"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in base-64 format"
 msgstr "anta att inmatning är i base-64-format"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in binary format"
 msgstr "anta att inmatning är i binärformat"
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:296
 msgid "use system's dirmngr if available"
 msgstr "använd systemets dirmngr om tillgängligt"
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "never consult a CRL"
 msgstr "kontrollera aldrig mot spärrlista"
 
-#: sm/gpgsm.c:302
+#: sm/gpgsm.c:304
 msgid "check validity using OCSP"
 msgstr "kontrollera giltigheten med OCSP"
 
-#: sm/gpgsm.c:305
+#: sm/gpgsm.c:309
 msgid "|N|number of certificates to include"
 msgstr "|N|antal certifikat att inkludera"
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:312
 msgid "|FILE|take policy information from FILE"
 msgstr "|FIL|hämta policyinformation från FIL"
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:315
 msgid "do not check certificate policies"
 msgstr "kontrollera inte certifikatpolicier"
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:319
 msgid "fetch missing issuer certificates"
 msgstr "hämta saknade utfärdarcertifikat"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:323
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMN|använd NAMN som standardmottagare"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:325
 msgid "use the default key as default recipient"
 msgstr "använd standardnyckeln som standardmottagare"
 
-#: sm/gpgsm.c:338
+#: sm/gpgsm.c:342
 msgid "don't use the terminal at all"
 msgstr "använd inte terminalen alls"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:346
 msgid "force v3 signatures"
 msgstr "tvinga v3-signaturer"
 
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:347
 msgid "always use a MDC for encryption"
 msgstr "använd alltid en MDC för kryptering"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:352
 msgid "batch mode: never ask"
 msgstr "satsläge: fråga aldrig"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:353
 msgid "assume yes on most questions"
 msgstr "anta ja på de flesta frågorna"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:354
 msgid "assume no on most questions"
 msgstr "anta nej på de flesta frågorna"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:356
 msgid "add this keyring to the list of keyrings"
 msgstr "lägg till denna nyckelring till listan över nyckelringar"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:357
 msgid "add this secret keyring to the list"
 msgstr "lägg till denna hemliga nyckelring till listan"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:359
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|VÄRD|använd den här nyckelservern för att slå upp nycklar"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:360
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMN|ställ in terminalteckentabell till NAMN"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:364
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NIVÅ|ställ in felsökningsnivån till NIVÅ"
 
-#: sm/gpgsm.c:375
+#: sm/gpgsm.c:379
 msgid "|FILE|load extension module FILE"
 msgstr "|FIL|läs in tilläggsmodulen FIL"
 
-#: sm/gpgsm.c:381
+#: sm/gpgsm.c:385
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMN|använd chifferalgoritmen NAMN"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:387
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMN|använd sammandragsalgoritmen NAMN"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:389
 msgid "|N|use compress algorithm N"
 msgstr "|N|använd komprimeringsalgoritmen N"
 
-#: sm/gpgsm.c:522
+#: sm/gpgsm.c:528
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Användning: gpgsm [flaggor] [filer] (-h för hjälp)"
 
 # Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
-#: sm/gpgsm.c:525
+#: sm/gpgsm.c:531
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7299,30 +7426,35 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera med S/MIME-protokollet\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: sm/gpgsm.c:604
+#: sm/gpgsm.c:610
 msgid "usage: gpgsm [options] "
 msgstr "användning: gpgsm [flaggor] "
 
-#: sm/gpgsm.c:685
+#: sm/gpgsm.c:691
 #, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "kan inte kryptera till \"%s\": %s\n"
 
-#: sm/gpgsm.c:1237
+#: sm/gpgsm.c:713
+#, fuzzy, c-format
+msgid "unknown validation model `%s'\n"
+msgstr "okänd flagga \"%s\"\n"
+
+#: sm/gpgsm.c:1264
 msgid "WARNING: running with faked system time: "
 msgstr "VARNING: kör med falsk systemtid: "
 
-#: sm/gpgsm.c:1316
+#: sm/gpgsm.c:1344
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "importerar vanliga certifikat \"%s\"\n"
 
-#: sm/gpgsm.c:1334
+#: sm/gpgsm.c:1362
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan inte signera med \"%s\": %s\n"
 
-#: sm/gpgsm.c:1529
+#: sm/gpgsm.c:1543
 msgid "this command has not yet been implemented\n"
 msgstr "det här kommandot har ännu inte implementerats\n"
 
@@ -7344,7 +7476,7 @@ msgstr "enkla certifikatkontroller misslyckades - importeras inte\n"
 msgid "error importing certificate: %s\n"
 msgstr "fel vid import av certifikat: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:375
+#: sm/import.c:541 tools/gpg-connect-agent.c:374
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "fel vid läsning av indata: %s\n"
@@ -7433,7 +7565,7 @@ msgstr ""
 "\n"
 "%s%sÄr du säker på att du vill göra det här?"
 
-#: sm/qualified.c:234
+#: sm/qualified.c:234 sm/verify.c:536
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7458,27 +7590,32 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "sökande efter kvalificerat certifikat misslyckades: %s\n"
 
-#: sm/verify.c:386
+#: sm/verify.c:388
 msgid "Signature made "
 msgstr "Signatur gjord "
 
-#: sm/verify.c:390
+#: sm/verify.c:392
 msgid "[date not given]"
 msgstr "[datum inte angivet]"
 
-#: sm/verify.c:391
-#, c-format
-msgid " using certificate ID %08lX\n"
+#: sm/verify.c:393
+#, fuzzy, c-format
+msgid " using certificate ID 0x%08lX\n"
 msgstr " använder certificate-id %08lX\n"
 
-#: sm/verify.c:507
+#: sm/verify.c:514
 msgid "Good signature from"
 msgstr "Korrekt signatur från"
 
-#: sm/verify.c:508
+#: sm/verify.c:515
 msgid "                aka"
 msgstr "      även känd som"
 
+#: sm/verify.c:533
+#, fuzzy
+msgid "This is a qualified signature\n"
+msgstr "Detta kommer att bli en självsignatur.\n"
+
 #: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 msgid "quiet"
 msgstr "tyst"
@@ -7515,132 +7652,137 @@ msgstr ""
 "Syntax: gpg-connect-agent [flaggor]\n"
 "Anslut till en körande agent och skicka kommandon\n"
 
-#: tools/gpg-connect-agent.c:315
+#: tools/gpg-connect-agent.c:314
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "flaggan \"%s\" kräver ett program och valfria argument\n"
 
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:323
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "flaggan \"%s\" ignoreras på grund av \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:382
+#: tools/gpg-connect-agent.c:381
 msgid "line too long - skipped\n"
 msgstr "raden är för lång - hoppades över\n"
 
-#: tools/gpg-connect-agent.c:386
+#: tools/gpg-connect-agent.c:385
 msgid "line shortened due to embedded Nul character\n"
 msgstr "rad nerkortad på grund av inbäddat Nul-tecken\n"
 
-#: tools/gpg-connect-agent.c:458
+#: tools/gpg-connect-agent.c:457
 #, c-format
 msgid "unknown command `%s'\n"
 msgstr "okänt kommando \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:466
+#: tools/gpg-connect-agent.c:465
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "sändande rad misslyckades: %s\n"
 
-#: tools/gpg-connect-agent.c:474
+#: tools/gpg-connect-agent.c:473
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "mottagande rad misslyckades: %s\n"
 
-#: tools/gpg-connect-agent.c:784
+#: tools/gpg-connect-agent.c:789
 #, c-format
 msgid "error sending %s command: %s\n"
 msgstr "fel vid sändning av %s-kommando: %s\n"
 
-#: tools/gpg-connect-agent.c:793
+#: tools/gpg-connect-agent.c:798
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "fel vid sändning av standardflaggor: %s\n"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
 msgid "Options controlling the diagnostic output"
 msgstr "Flaggor som kontrollerar diagnosutdata"
 
-#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
+#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
 msgid "Options controlling the configuration"
 msgstr "Flaggor som kontrollerar konfigurationen"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
-#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
+#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
 msgid "Options useful for debugging"
 msgstr "Flaggor användbara för felsökning"
 
-#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
-#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FIL|skriv serverlägesloggar till FIL"
 
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
 msgid "Options controlling the security"
 msgstr "Flaggor som kontrollerar säkerheten"
 
-#: tools/gpgconf-comp.c:501
+#: tools/gpgconf-comp.c:492
 #, fuzzy
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|låt mellanlagrad PIN-koder gå ut efter N sekunder"
 
-#: tools/gpgconf-comp.c:505
+#: tools/gpgconf-comp.c:496
 #, fuzzy
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|låt mellanlagrad PIN-koder gå ut efter N sekunder"
 
-#: tools/gpgconf-comp.c:509
+#: tools/gpgconf-comp.c:500
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:510
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:638
+#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#, fuzzy
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAMN|kryptera för NAMN"
+
+#: tools/gpgconf-comp.c:635
 msgid "Configuration for Keyservers"
 msgstr "Konfiguration för nyckelservrar"
 
-#: tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:640
 msgid "allow PKA lookups (DNS requests)"
 msgstr "tillåt PKA-uppslag (DNS-förfrågningar)"
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:685
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:705
+#: tools/gpgconf-comp.c:708
 msgid "do not check CRLs for root certificates"
 msgstr "kontrollera inte spärrlistor för rotcertifikat"
 
-#: tools/gpgconf-comp.c:749
+#: tools/gpgconf-comp.c:752
 msgid "Options controlling the format of the output"
 msgstr "Flaggor som kontrollerar formatet på utdata"
 
-#: tools/gpgconf-comp.c:785
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the interactivity and enforcement"
 msgstr "Flaggor som kontrollerar interaktivitet och framtvingande"
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
 msgid "Configuration for HTTP servers"
 msgstr "Konfiguration för HTTP-servrar"
 
-#: tools/gpgconf-comp.c:806
+#: tools/gpgconf-comp.c:809
 msgid "use system's HTTP proxy setting"
 msgstr "använd systemets HTTP-proxyinställningar"
 
-#: tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:814
 msgid "Configuration of LDAP servers to use"
 msgstr "Konfiguration av LDAP-servrar som ska användas"
 
-#: tools/gpgconf-comp.c:848
+#: tools/gpgconf-comp.c:851
 msgid "Configuration for OCSP"
 msgstr "Konfiguration för OCSP"
 
-#: tools/gpgconf-comp.c:2681
+#: tools/gpgconf-comp.c:2684
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index 5c4cff8c1..4137914c3 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.9.94\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-07-05 18:01+0200\n"
+"POT-Creation-Date: 2007-08-10 15:49+0200\n"
 "PO-Revision-Date: 2006-11-04 03:45+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@belgeler.gen.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "PIN giriş kilidi edinilemedi: %s\n"
 
-#: agent/call-pinentry.c:426
+#: agent/call-pinentry.c:436
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -28,7 +28,7 @@ msgstr ""
 "Lütfen PIN'inizi giriniz, böylelikle bu oturumda bu gizli anahtar kilitsiz "
 "olabilecek"
 
-#: agent/call-pinentry.c:429
+#: agent/call-pinentry.c:439
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -36,36 +36,36 @@ msgstr ""
 "Lütfen anahtar parolanızı giriniz, böylelikle bu oturumda bu gizli anahtar "
 "kilitsiz olabilecek"
 
-#: agent/call-pinentry.c:476
+#: agent/call-pinentry.c:486
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
+#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
 msgid "PIN too long"
 msgstr "PIN çok uzun"
 
-#: agent/call-pinentry.c:497
+#: agent/call-pinentry.c:507
 msgid "Passphrase too long"
 msgstr "Anahtar Parolası çok uzun"
 
-#: agent/call-pinentry.c:505
+#: agent/call-pinentry.c:515
 msgid "Invalid characters in PIN"
 msgstr "PIN içinde geçersiz karakterler var"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:520
 msgid "PIN too short"
 msgstr "PIN çok kısa"
 
-#: agent/call-pinentry.c:522
+#: agent/call-pinentry.c:532
 msgid "Bad PIN"
 msgstr "PIN hatalı"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:533
 msgid "Bad Passphrase"
 msgstr "Anahtar Parolası hatalı"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:569
 msgid "Passphrase"
 msgstr "Anahtar Parolası"
 
@@ -81,14 +81,14 @@ msgstr "%d bitlikten daha büyük SSH anahtarları desteklenmiyor\n"
 msgid "can't create `%s': %s\n"
 msgstr "\"%s\" oluşturulamıyor: %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
 #: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
-#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1796
+#: sm/gpgsm.c:1833 sm/gpgsm.c:1871 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
@@ -175,31 +175,42 @@ msgstr[1] ""
 msgid "Take this one anyway"
 msgstr "Bu anahtar yine de kullanılsın mı? (e/H ya da y/N) "
 
-#: agent/genkey.c:99
+#: agent/genkey.c:99 agent/genkey.c:114
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Anahtar parolasını giriniz\n"
 
-#: agent/genkey.c:144
+#: agent/genkey.c:107
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+
+#: agent/genkey.c:113
+msgid "Yes, protection is not needed"
+msgstr ""
+
+#: agent/genkey.c:158
 #, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr "Anahtarınızı korumak için Lütfen Anahtar Parolanızı giriniz%0A"
 
-#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
+#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
 msgid "Please re-enter this passphrase"
 msgstr "Lütfen bu anahtar parolasını tekrar girin"
 
-#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
 #: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr "aynı değiller - tekrar deneyin"
 
-#: agent/genkey.c:263
+#: agent/genkey.c:280
 msgid "Please enter the new passphrase"
 msgstr "Lütfen yeni anahtar parolasını girin"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:104
 msgid ""
 "@Options:\n"
 " "
@@ -207,109 +218,109 @@ msgstr ""
 "@Seçenekler:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:103
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr "sunucu olarak (önalanda) çalışır"
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr "artalan süreci olarak çalışır"
 
-#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
-#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
 #: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "ayrıntılı"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
-#: sm/gpgsm.c:337
+#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "biraz daha sessiz olur"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:109
+#: agent/gpg-agent.c:118 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr "sh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr "csh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|DOSYA|seçenekler DOSYAdan okunur"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:119
+#: agent/gpg-agent.c:125 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr "konsoldan kopulmaz"
 
-#: agent/gpg-agent.c:125
+#: agent/gpg-agent.c:126
 msgid "do not grab keyboard and mouse"
 msgstr "klavye ve fare gaspedilmez"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "sunucu için bir günlük dosyası kullanılır"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:129
 msgid "use a standard location for the socket"
 msgstr "soket için standart bir yer kullanılır"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|UYG|PIN girme uygulaması olarak UYG kullanılır"
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "[UYG|Akıllı kart uygulaması olarak UYG kullanılır"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 msgid "do not use the SCdaemon"
 msgstr "Akıllı kart süreci kullanılmaz"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "ignore requests to change the TTY"
 msgstr "TTY değiştirme istekleri yoksayılır"
 
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:145
 msgid "ignore requests to change the X display"
 msgstr "X birimi değiştirme istekleri yoksayılır"
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
 
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr "imzalarken PIN arabelleği kullanılmaz"
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "istemcilerin anahtarları \"güvenilir\" olarak imlemesine izin verilir"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:158
 msgid "allow presetting passphrase"
 msgstr "anahtar parolasının önceden atanmasına izin verilir"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr "ssh-agent öykünümü etkinleşir"
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|DOSYA|ortam ayarlarını ayrıca DOSYAya da yazar"
 
-#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:206 sm/gpgsm.c:525 tools/gpg-connect-agent.c:124
 #: tools/gpgconf.c:89 tools/symcryptrun.c:204
 msgid "Please report bugs to <"
 msgstr "Yazılım hatalarını lütfen <"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:260
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] (yardım için -h)"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:262
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -317,131 +328,131 @@ msgstr ""
 "Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
 "GnuPG için gizli anahtar yönetimi\n"
 
-#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
+#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
 
-#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
-#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:340 sm/gpgsm.c:772 sm/gpgsm.c:775 tools/symcryptrun.c:1026
 #, fuzzy, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "libksba çok eski (gereken %s, sizinki %s)\n"
 
-#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
+#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:863
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
 
-#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
-#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: scd/scdaemon.c:421 sm/gpgsm.c:867 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
+#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:874
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "`%s' oluşturulurken hata: %s\n"
 
-#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
-#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:921
+#: agent/gpg-agent.c:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
+#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:908
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "`%s' dizini oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
+#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr "soketin ismi çok uzun\n"
 
-#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "soket oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "bu oturumda çalışan gpg-agent yok\n"
 
-#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
+#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "soket `%s'e bağlanırken hata: %s\n"
 
-#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
+#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "soket dinleme başarısız: %s\n"
 
-#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "`%s' soketi dinlemede\n"
 
-#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
+#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "dizin `%s' oluşturuldu\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1377
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "%s için stat() başarısız oldu: %s\n"
 
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1381
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "`%s' ev dizini olarak kullanılamıyor\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "tutamak 0x%lx, fd %d için başlatıldı\n"
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1497
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "tutamak 0x%lx, fd %d için sonlandırıldı\n"
 
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh tutamağı 0x%lx, fd %d için başlatıldı\n"
 
-#: agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1519
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh tutamağı 0x%lx, fd %d için sonlandırıldı\n"
 
-#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
+#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select başarısız: %s - 1s bekliyor\n"
 
-#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
+#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s durdu\n"
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1752
 msgid "no gpg-agent running in this session\n"
 msgstr "bu oturumda çalışan gpg-agent yok\n"
 
-#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:751
+#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO çevre değişkeni hatalı\n"
 
-#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
-#: tools/gpg-connect-agent.c:762
+#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokolü sürüm %d desteklenmiyor\n"
@@ -509,42 +520,42 @@ msgstr "anahtar parolası sorulurken hata: %s\n"
 msgid "cancelled\n"
 msgstr "iptal edildi\n"
 
-#: agent/trustlist.c:131 agent/trustlist.c:319
+#: agent/trustlist.c:132 agent/trustlist.c:322
 #, c-format
 msgid "error opening `%s': %s\n"
 msgstr "'%s' açılırken hata: %s\n"
 
-#: agent/trustlist.c:146
+#: agent/trustlist.c:147
 #, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "`%s' dosyası, %d. satır: %s\n"
 
-#: agent/trustlist.c:166 agent/trustlist.c:174
+#: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr "`%2$s' dosyasının %3$d. satırındaki \"%1$s\" deyimi yoksayıldı\n"
 
-#: agent/trustlist.c:180
+#: agent/trustlist.c:181
 #, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "sistem güvence listesi `%s' kullanım dışı\n"
 
-#: agent/trustlist.c:215
+#: agent/trustlist.c:216
 #, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "`%s', %d. satırda parmakizi hatalı\n"
 
-#: agent/trustlist.c:241 agent/trustlist.c:248
+#: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr "`%s', %d. satırda anahtar bayrağı geçersiz\n"
 
-#: agent/trustlist.c:280
+#: agent/trustlist.c:283
 #, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "`%s' okunurken %d. satırda hata: %s\n"
 
-#: agent/trustlist.c:381 agent/trustlist.c:420
+#: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
 msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
 
@@ -557,7 +568,7 @@ msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:496
+#: agent/trustlist.c:507
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -569,7 +580,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:505
+#: agent/trustlist.c:516
 msgid "Correct"
 msgstr "Doğru"
 
@@ -581,7 +592,7 @@ msgstr "Doğru"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:525
+#: agent/trustlist.c:536
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -590,50 +601,50 @@ msgstr ""
 "Kullanıcı sertifikalarının%%0A  \"%s\"%%0Aile doğru olarak onaylanacağından "
 "son derece emin misiniz?"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "Yes"
 msgstr "Evet"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "No"
 msgstr "Hayır"
 
-#: common/exechelp.c:302 common/exechelp.c:393
+#: common/exechelp.c:302 common/exechelp.c:390
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "boru oluşturulurken hata: %s\n"
 
-#: common/exechelp.c:369 common/exechelp.c:426
+#: common/exechelp.c:366 common/exechelp.c:423
 #, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "okumak için boruya fdopen yapılamadı: %s\n"
 
-#: common/exechelp.c:405 common/exechelp.c:635
+#: common/exechelp.c:402 common/exechelp.c:632
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "süreç çatallanırken hata: %s\n"
 
-#: common/exechelp.c:461 common/exechelp.c:504
+#: common/exechelp.c:458 common/exechelp.c:501
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
 
-#: common/exechelp.c:469
+#: common/exechelp.c:466
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "süreç %d çıkış kodu alınırken hata: %s\n"
 
-#: common/exechelp.c:475 common/exechelp.c:515
+#: common/exechelp.c:472 common/exechelp.c:512
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "`%s' çalışırken hata: çıkış durumu: %d\n"
 
-#: common/exechelp.c:510
+#: common/exechelp.c:507
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr "`%s' çalıştırılırken hata: muhtemelen kurulu değil\n"
 
-#: common/exechelp.c:521
+#: common/exechelp.c:518
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "`%s' çalışırken hata: sonlandırıldı\n"
@@ -651,24 +662,24 @@ msgstr "konak yok"
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent bu oturumda kullanılamaz\n"
 
-#: common/simple-pwquery.c:376
+#: common/simple-pwquery.c:373
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
 
-#: common/simple-pwquery.c:387
+#: common/simple-pwquery.c:384
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agent ile haberleşme problemi\n"
 
-#: common/simple-pwquery.c:397
+#: common/simple-pwquery.c:394
 msgid "problem setting the gpg-agent options\n"
 msgstr "gpg-agent seçenekleri ayarlanırken sorun çıktı\n"
 
-#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+#: common/simple-pwquery.c:557 common/simple-pwquery.c:653
 msgid "canceled by user\n"
 msgstr "kullanıcı tarafından iptal edildi\n"
 
-#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+#: common/simple-pwquery.c:572 common/simple-pwquery.c:659
 msgid "problem with the agent\n"
 msgstr "aracı ile sorun var\n"
 
@@ -845,7 +856,7 @@ msgstr "UYARI: geçersiz simgelem verisi bulundu\n"
 msgid "not human readable"
 msgstr "insan okuyabilir değil"
 
-#: g10/card-util.c:62 g10/card-util.c:305
+#: g10/card-util.c:62 g10/card-util.c:308
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP anahtarı kullanılabilir değil: %s\n"
@@ -855,153 +866,153 @@ 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:75 g10/card-util.c:1391 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "bu önceden betik kipinde yapılamaz\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
 #: g10/keygen.c:1644
 msgid "Your selection? "
 msgstr "Seçiminiz? "
 
-#: g10/card-util.c:215 g10/card-util.c:265
+#: g10/card-util.c:218 g10/card-util.c:268
 msgid "[not set]"
 msgstr "[belirtilmedi]"
 
-#: g10/card-util.c:412
+#: g10/card-util.c:415
 msgid "male"
 msgstr "erkek"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "female"
 msgstr "dişi"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "unspecified"
 msgstr "belirtilmemiş"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "not forced"
 msgstr "zorlanmadı"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "forced"
 msgstr "zorlandı"
 
-#: g10/card-util.c:518
+#: g10/card-util.c:521
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Hata: Şimdilik sadece US-ASCII mümkün.\n"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:523
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Hata: \"<\" karakteri kullanılmamalı.\n"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:525
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Hata: Çift boşluğa izin verilmez.\n"
 
-#: g10/card-util.c:539
+#: g10/card-util.c:542
 msgid "Cardholder's surname: "
 msgstr "Kart sahibinin soyadı: "
 
-#: g10/card-util.c:541
+#: g10/card-util.c:544
 msgid "Cardholder's given name: "
 msgstr "Kart sahibinin adı: "
 
-#: g10/card-util.c:559
+#: g10/card-util.c:562
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Hata: İsimler birlikte çok uzun oluyor (sınır: %d karakter).\n"
 
-#: g10/card-util.c:580
+#: g10/card-util.c:583
 msgid "URL to retrieve public key: "
 msgstr "genel anahtarın alınacağı URL: "
 
-#: g10/card-util.c:588
+#: g10/card-util.c:591
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Hata: URL çok uzun (sınır: %d karakter).\n"
 
-#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
+#: g10/card-util.c:689 g10/card-util.c:758 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "\"%s\" okunurken hata: %s\n"
 
-#: g10/card-util.c:694
+#: g10/card-util.c:697
 msgid "Login data (account name): "
 msgstr "Oturum açma verisi (hesap adı): "
 
-#: g10/card-util.c:704
+#: g10/card-util.c:707
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Hata: Oturum açma verisi çok uzun (sınır: %d karakter).\n"
 
-#: g10/card-util.c:763
+#: g10/card-util.c:766
 msgid "Private DO data: "
 msgstr "Özel DO verisi: "
 
-#: g10/card-util.c:773
+#: g10/card-util.c:776
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Hata: Özel DO çok uzun (sınır: %d karakter).\n"
 
-#: g10/card-util.c:793
+#: g10/card-util.c:796
 msgid "Language preferences: "
 msgstr "Dil tercihleri: "
 
-#: g10/card-util.c:801
+#: g10/card-util.c:804
 msgid "Error: invalid length of preference string.\n"
 msgstr "Hata: tercih dizgesinin uzunluğu geçersiz.\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:813
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Hata: tercih dizgesindeki karakterler geçersiz.\n"
 
-#: g10/card-util.c:831
+#: g10/card-util.c:834
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Cinsiyet ((E)rkek, (D)işi veya boşluk): "
 
-#: g10/card-util.c:845
+#: g10/card-util.c:848
 msgid "Error: invalid response.\n"
 msgstr "Hata: yanıt geçersiz.\n"
 
-#: g10/card-util.c:866
+#: g10/card-util.c:869
 msgid "CA fingerprint: "
 msgstr "CA parmak izi: "
 
-#: g10/card-util.c:889
+#: g10/card-util.c:892
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Hata: biçimli parmakizi geçersiz\n"
 
-#: g10/card-util.c:937
+#: g10/card-util.c:940
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "anahtar işlemi mümkün değil: %s\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:941
 msgid "not an OpenPGP card"
 msgstr "bir OpenPGP kartı değil"
 
-#: g10/card-util.c:947
+#: g10/card-util.c:950
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "geçerli anahtar bilgisi alınırken hata: %s\n"
 
-#: g10/card-util.c:1031
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr "Mevcut anahtar değiştirilsin mi? (e/H ya da y/N) "
 
-#: g10/card-util.c:1051 g10/card-util.c:1060
+#: g10/card-util.c:1054 g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Şifreli anahtarın kartsız yedeği yapılsın mı? (E/h ya da Y/n) "
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1075
 msgid "Replace existing keys? (y/N) "
 msgstr "Mevcut anahtarlar değiştirilsin mi? (e/H ya da y/N) "
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1084
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1012,120 +1023,120 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "Bunları --change-pin komutunu kullanarak değiştirmelisiniz\n"
 
-#: g10/card-util.c:1115
+#: g10/card-util.c:1118
 msgid "Please select the type of key to generate:\n"
 msgstr "Lütfen üretilecek anahtar türünü seçiniz:\n"
 
-#: g10/card-util.c:1117 g10/card-util.c:1194
+#: g10/card-util.c:1120 g10/card-util.c:1197
 msgid "   (1) Signature key\n"
 msgstr "   (1) İmzalama anahtarı\n"
 
-#: g10/card-util.c:1118 g10/card-util.c:1196
+#: g10/card-util.c:1121 g10/card-util.c:1199
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Şifreleme anahtarı\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1198
+#: g10/card-util.c:1122 g10/card-util.c:1201
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Kimlik kanıtlama anahtarı\n"
 
-#: g10/card-util.c:1135 g10/card-util.c:1214 g10/keyedit.c:945
+#: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
 #: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
-#: g10/card-util.c:1191
+#: g10/card-util.c:1194
 msgid "Please select where to store the key:\n"
 msgstr "Lütfen anahtarın saklanacağı yeri seçiniz:\n"
 
-#: g10/card-util.c:1226
+#: g10/card-util.c:1229
 msgid "unknown key protection algorithm\n"
 msgstr "bilinmeyen anahtar koruma algoritması\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1234
 msgid "secret parts of key are not available\n"
 msgstr "anahtarın gizli parçaları kullanılabilir değil\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1239
 msgid "secret key already stored on a card\n"
 msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
 
-#: g10/card-util.c:1304 g10/keyedit.c:1362
+#: g10/card-util.c:1307 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1309
 msgid "show admin commands"
 msgstr "yönetici komutlarını gösterir"
 
-#: g10/card-util.c:1307 g10/keyedit.c:1365
+#: g10/card-util.c:1310 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "bunu gösterir"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1312
 msgid "list all available data"
 msgstr "tüm kullanılabilir veriyi listeler"
 
-#: g10/card-util.c:1312
+#: g10/card-util.c:1315
 msgid "change card holder's name"
 msgstr "kart sahibinin ismini değiştirir"
 
-#: g10/card-util.c:1313
+#: g10/card-util.c:1316
 msgid "change URL to retrieve key"
 msgstr "anahtarın alınacağı URL değiştirilir"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1317
 msgid "fetch the key specified in the card URL"
 msgstr "kart URL'sinde belirtilmiş anahtarı alır"
 
-#: g10/card-util.c:1315
+#: g10/card-util.c:1318
 msgid "change the login name"
 msgstr "oturum açma ismini değiştirir"
 
-#: g10/card-util.c:1316
+#: g10/card-util.c:1319
 msgid "change the language preferences"
 msgstr "dil tercihlerini değiştirir"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1320
 msgid "change card holder's sex"
 msgstr "kart sahibinin cinsiyetini değiştirir"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1321
 msgid "change a CA fingerprint"
 msgstr "bir CA parmakizini değiştirir"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1322
 msgid "toggle the signature force PIN flag"
 msgstr "imza zorlama PIN'i bayrağını değiştirir"
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1323
 msgid "generate new keys"
 msgstr "yeni anahtarlar üretir"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1324
 msgid "menu to change or unblock the PIN"
 msgstr "PIN'i değiştirme veya engelleme menüsü"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1325
 msgid "verify the PIN and list all data"
 msgstr "PIN'i doğrular ve tüm veriyi listeler"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1634
+#: g10/card-util.c:1445 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Komut> "
 
-#: g10/card-util.c:1480
+#: g10/card-util.c:1483
 msgid "Admin-only command\n"
 msgstr "Yöneticiye özel komut\n"
 
-#: g10/card-util.c:1511
+#: g10/card-util.c:1514
 msgid "Admin commands are allowed\n"
 msgstr "Yönetici komutlarına izin verilir\n"
 
-#: g10/card-util.c:1513
+#: g10/card-util.c:1516
 msgid "Admin commands are not allowed\n"
 msgstr "Yönetici komutlarına izin verilmez\n"
 
-#: g10/card-util.c:1587 g10/keyedit.c:2255
+#: g10/card-util.c:1590 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 
@@ -1133,7 +1144,7 @@ msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' açılamadı\n"
@@ -1432,7 +1443,7 @@ msgstr "yardımcı anahtar %s, asıl anahtar %s yerine kullanılıyor\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "anahtar %s: genel anahtarsız gizli anahtar - atlandı\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1448,27 +1459,27 @@ msgstr "|[dosya]|bir imza yapar"
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosya]|açıkça okunabilen bir imza yapar"
 
-#: g10/gpg.c:372 sm/gpgsm.c:244
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "bağımsız bir imza yapar"
 
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "veriyi şifreler"
 
-#: g10/gpg.c:375 sm/gpgsm.c:246
+#: g10/gpg.c:375 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "sadece simetrik şifre ile şifreler"
 
-#: g10/gpg.c:377 sm/gpgsm.c:247
+#: g10/gpg.c:377 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "veri şifresini açar (öntanımlı)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:248
+#: g10/gpg.c:379 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "bir imzayı doğrular"
 
-#: g10/gpg.c:381 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "anahtarları listeler"
 
@@ -1480,11 +1491,11 @@ msgstr "anahtarları ve imzaları listeler"
 msgid "list and check key signatures"
 msgstr "anahtar imzalarını listeler ve sınar"
 
-#: g10/gpg.c:385 sm/gpgsm.c:254
+#: g10/gpg.c:385 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "anahtarları ve parmak izlerini listeler"
 
-#: g10/gpg.c:386 sm/gpgsm.c:252
+#: g10/gpg.c:386 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "gizli anahtarları listeler"
 
@@ -1520,11 +1531,11 @@ msgstr "bir yürürlükten kaldırma sertifikası üretir"
 msgid "export keys"
 msgstr "anahtarları gönderir"
 
-#: g10/gpg.c:397 sm/gpgsm.c:257
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "anahtarları bir anahtar sunucusuna gönderir"
 
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "anahtarları bir anahtar sunucusundan indirir"
 
@@ -1560,11 +1571,11 @@ msgstr "güvence veritabanını günceller"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir"
 
-#: g10/gpg.c:430 sm/gpgsm.c:262
+#: g10/gpg.c:430 sm/gpgsm.c:264
 msgid "run in server mode"
 msgstr "sunucu kipinde çalışır"
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
 #: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1575,31 +1586,31 @@ msgstr ""
 "Seçenekler:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:279
+#: g10/gpg.c:434 sm/gpgsm.c:281
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluşturur"
 
-#: g10/gpg.c:436 sm/gpgsm.c:291
+#: g10/gpg.c:436 sm/gpgsm.c:293
 msgid "|NAME|encrypt for NAME"
 msgstr "|İSİM|İSİM için şifreleme yapar"
 
-#: g10/gpg.c:447 sm/gpgsm.c:327
+#: g10/gpg.c:447 sm/gpgsm.c:331
 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:448 sm/gpgsm.c:330
+#: g10/gpg.c:448 sm/gpgsm.c:334
 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:453 sm/gpgsm.c:332
+#: g10/gpg.c:453 sm/gpgsm.c:336
 msgid "use canonical text mode"
 msgstr "kurallı metin kipini kullanır"
 
-#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "çıktı dosyası olarak kullanılır"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "hiçbir değişiklik yapmaz"
 
@@ -1615,7 +1626,7 @@ msgstr "kesin OpenPGP davranışı etkin olur"
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x uyumlu iletiler üretilir"
 
-#: g10/gpg.c:553 sm/gpgsm.c:393
+#: g10/gpg.c:553 sm/gpgsm.c:397
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1623,7 +1634,7 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:396
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1663,7 +1674,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:532
+#: g10/gpg.c:781 sm/gpgsm.c:538
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1691,7 +1702,7 @@ msgstr "Sıkıştırma: "
 msgid "usage: gpg [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:669
+#: g10/gpg.c:1045 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
@@ -1767,456 +1778,456 @@ msgstr "UYARI: '%s' eklentisini içeren dizinin izinleri güvensiz\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr "anahtarların listelenmesi sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr "imza listelemesi sırasında poliçe URLleri gösterilir"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1544
 msgid "show all notations during signature listings"
 msgstr "imza listelemesi sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr "imza listelemesi sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr "imza listelemesi sırasında kullanıcı kanaklı simgelemleri gösterir"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1552
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "imza listelemesi sırasında tercih edilen anahtar sunucusu adresi gösterilir"
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr "anahtar listelemesi sırasında kullanıcı kimliği geçerliliğini gösterir"
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 "anahtar listelerinde yürürlükten kaldırılmış ve zamanaşımına uğramış "
 "kullanıcı kimlikleri gösterilir"
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 "anahtar listelerinde yürürlükten kaldırılmış ve zamanaşımına uğramış "
 "yardımcı anahtarlar gösterilir"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1560
 msgid "show the keyring name in key listings"
 msgstr "anahtar listelerinde anahtarlık ismini gösterir"
 
-#: g10/gpg.c:1564
+#: g10/gpg.c:1562
 msgid "show expiration dates during signature listings"
 msgstr "imza listelemesi sırasında zamanaşımı tarihleri gösterilir"
 
-#: g10/gpg.c:1827
+#: g10/gpg.c:1825
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt çok eski (%s lazım, sizinki %s)\n"
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1981
 #, 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:2243 g10/gpg.c:2884 g10/gpg.c:2896
+#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
 #, 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:2401 g10/gpg.c:2413
+#: g10/gpg.c:2399 g10/gpg.c:2411
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "'%s' geçerli bir imza zamanaşımı değil\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2493
 #, 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:2518 g10/gpg.c:2713 g10/keyedit.c:4084
+#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2528
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2531
 msgid "invalid keyserver options\n"
 msgstr "anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2538
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2541
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2548
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2551
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2558
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2561
 msgid "invalid list options\n"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2569
 msgid "display photo IDs during signature verification"
 msgstr "imza doğrulaması sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2571
 msgid "show policy URLs during signature verification"
 msgstr "imza doğrulaması sırasında poliçe adreslerini gösterir"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2573
 msgid "show all notations during signature verification"
 msgstr "imza doğrulaması sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2575
 msgid "show IETF standard notations during signature verification"
 msgstr "imza doğrulaması sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2579
 msgid "show user-supplied notations during signature verification"
 msgstr "imza doğrulaması sırasında kullanıcı kaynaklı simgelemleri gösterir"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2581
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "imza doğrulaması sırasında tercih edilen anahtar sunucusu adresleri "
 "gösterilir"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2583
 msgid "show user ID validity during signature verification"
 msgstr "imza doğrulaması sırasında kullanıcı kimliği geçerliliğini gösterir"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2585
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "imza doğrulamasında yürürlükten kaldırılan ve zamanaşımına uğrayan kullanıcı "
 "kimlikleri gösterilir"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2587
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 "imza doğrulamasında yürürlükten kaldırılan ve zamanaşımına uğrayan kullanıcı "
 "kimlikleri gösterilir"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2589
 msgid "validate signatures with PKA data"
 msgstr "imzaları PKA verisi ile doğrular"
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2591
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "imzaların güvenilirliğini geçerli PKA verisi ile yükseltir"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2598
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2601
 msgid "invalid verify options\n"
 msgstr "doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2608
 #, 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:2784
+#: g10/gpg.c:2782
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:2787
+#: g10/gpg.c:2785
 msgid "invalid auto-key-locate list\n"
 msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:2873 sm/gpgsm.c:1220
+#: g10/gpg.c:2871 sm/gpgsm.c:1247
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2875
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2884
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2887
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2902
 #, 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:2918
+#: g10/gpg.c:2916
 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:2924
+#: g10/gpg.c:2922
 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:2930
+#: g10/gpg.c:2928
 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:2943
+#: g10/gpg.c:2941
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
+#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1303
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
+#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1311
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3025
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3040
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3042
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3044
 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:3048
+#: g10/gpg.c:3046
 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:3050
+#: g10/gpg.c:3048
 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:3053
+#: g10/gpg.c:3051
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/gpg.c:3057
+#: g10/gpg.c:3055
 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:3064
+#: g10/gpg.c:3062
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3071
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3075
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özümleme tercihleri geçersiz\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3079
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/gpg.c:3114
+#: g10/gpg.c:3112
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s, %s ile henüz çalışmıyor\n"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3159
 #, 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:3166
+#: g10/gpg.c:3164
 #, 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:3171
+#: g10/gpg.c:3169
 #, 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:3263
+#: g10/gpg.c:3261
 #, 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:3274
+#: g10/gpg.c:3272
 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:3295
+#: g10/gpg.c:3293
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3300
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3302
 #, 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:3314
+#: g10/gpg.c:3312
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3325
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3327
 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:3332
+#: g10/gpg.c:3330
 #, 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:3350
+#: g10/gpg.c:3348
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3361
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3376
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3378
 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:3383
+#: g10/gpg.c:3381
 #, 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:3403
+#: g10/gpg.c:3401
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3410
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3435
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3443
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3447
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3468
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3553
 #, 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:3557
+#: g10/gpg.c:3555
 #, 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:3559
+#: g10/gpg.c:3557
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3568
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "anahtar sunucusunda arama başarısız: %s\n"
 
-#: g10/gpg.c:3580
+#: g10/gpg.c:3578
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
 
-#: g10/gpg.c:3631
+#: g10/gpg.c:3629
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/gpg.c:3639
+#: g10/gpg.c:3637
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/gpg.c:3729
+#: g10/gpg.c:3727
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' çittirim algoritması geçersiz\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3844
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/gpg.c:3850
+#: g10/gpg.c:3848
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4160
 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:4162
 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:4195
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
@@ -2228,7 +2239,7 @@ msgstr "anahtarlar bu anahtarlıktan alınır"
 msgid "make timestamp conflicts only a warning"
 msgstr "zaman damgası çelişkilerini uyarı olarak bildirir"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:368
+#: g10/gpgv.c:75 sm/gpgsm.c:372
 msgid "|FD|write status info to this FD"
 msgstr "|FD|durum bilgisini bu FD'ye yazar"
 
@@ -6623,43 +6634,43 @@ msgstr "Yönetici PIN'inin doğrulanması bu komut yüzünden şimdilik yasaktı
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
 
-#: scd/scdaemon.c:105
+#: scd/scdaemon.c:108
 msgid "run in multi server mode (foreground)"
 msgstr "çoklu sunucu kipinde çalışır (önalanda)"
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:357
+#: scd/scdaemon.c:114 sm/gpgsm.c:361
 msgid "read options from file"
 msgstr "seçenekler dosyadan okunur"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:124
 msgid "|N|connect to reader at port N"
 msgstr "|N|N. porttaki okuyucuya bağlanır"
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|İSİM|ct-API sürücüsü olarak İSİM kullanılır"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:126
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|İSİM|PC/SC sürücüsü olarak İSİM kullanılır"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:129
 msgid "do not use the internal CCID driver"
 msgstr "dahili CCID sürücüsü kullanılmaz"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:134
 msgid "do not use a reader's keypad"
 msgstr "bir okuyucu tuştakımı kullanılmaz"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:135
 msgid "allow the use of admin card commands"
 msgstr "yönetici kartı komutları kullanımına izin verir"
 
-#: scd/scdaemon.c:206
+#: scd/scdaemon.c:209
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Kullanımı: scdaemon [seçenekler] (yardım için -h)"
 
-#: scd/scdaemon.c:208
+#: scd/scdaemon.c:211
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6667,18 +6678,18 @@ msgstr ""
 "Sözdizimi: scdaemon [seçenekler] [komut [arg ...]]\n"
 "GnuPG için akıllı kart artalan süreci\n"
 
-#: scd/scdaemon.c:671
+#: scd/scdaemon.c:658
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 "Programı artalanda çalışır bırakmak için lütfen `--daemon' seçeneğini "
 "kullanın\n"
 
-#: scd/scdaemon.c:1019
+#: scd/scdaemon.c:1006
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "fd %d için eylemci başlatıldı\n"
 
-#: scd/scdaemon.c:1024
+#: scd/scdaemon.c:1011
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "fd %d için eylemci sonlandı\n"
@@ -6706,135 +6717,251 @@ msgstr "dirmngr protokolünün %d. sürümü desteklenmiyor\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr "dirmngr'a bağlanılamıyor - son çareye başvuruluyor\n"
 
-#: sm/certchain.c:174
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr ""
+
+#: sm/certchain.c:195
+msgid "chain"
+msgstr ""
+
+#: sm/certchain.c:196
+msgid "shell"
+msgstr ""
+
+#: sm/certchain.c:241
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "kritik sertifika eklentisi %s desteklenmiyor"
 
-#: sm/certchain.c:212
+#: sm/certchain.c:279
 msgid "issuer certificate is not marked as a CA"
 msgstr "sertifikacı onu bir CA gibi imlememiş"
 
-#: sm/certchain.c:250
+#: sm/certchain.c:317
 msgid "critical marked policy without configured policies"
 msgstr "yapılandırılmış poliçeler olmaksızın kritik imli poliçe"
 
-#: sm/certchain.c:260
+#: sm/certchain.c:327
 #, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "`%s' açılamadı: %s\n"
 
-#: sm/certchain.c:267 sm/certchain.c:296
+#: sm/certchain.c:334 sm/certchain.c:363
 msgid "note: non-critical certificate policy not allowed"
 msgstr "bilgi: kritik olmayan sertifika poliçesine izin verilmez"
 
-#: sm/certchain.c:271 sm/certchain.c:300
+#: sm/certchain.c:338 sm/certchain.c:367
 msgid "certificate policy not allowed"
 msgstr "sertifika poliçesine izin verilmiyor"
 
-#: sm/certchain.c:411
+#: sm/certchain.c:478
 msgid "looking up issuer at external location\n"
 msgstr "harici bir sertifikacı arar\n"
 
-#: sm/certchain.c:431
+#: sm/certchain.c:498
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "eşleşen sertifikacı sayısı: %d\n"
 
-#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
 msgid "failed to allocated keyDB handle\n"
 msgstr "ayrılmış anahtar veritabanı elde edilemedi: %s\n"
 
-#: sm/certchain.c:675
+#: sm/certchain.c:742
 msgid "certificate has been revoked"
 msgstr "sertifika yürürlükten kaldırılmıştı"
 
-#: sm/certchain.c:684
+#: sm/certchain.c:752
 msgid "no CRL found for certificate"
 msgstr "sertifika için bir CRL yok"
 
-#: sm/certchain.c:688
+#: sm/certchain.c:757
+msgid "the status of the certificate is unknown"
+msgstr ""
+
+#: sm/certchain.c:762
 msgid "the available CRL is too old"
 msgstr "mevcut CRL çok eski"
 
-#: sm/certchain.c:690
+#: sm/certchain.c:764
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "\"dirmngr\"'ın düzgün olarak kurulu olduğundan lütfen emin olunuz\n"
 
-#: sm/certchain.c:695
+#: sm/certchain.c:770
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "CRL sınaması başarısız: %s"
 
-#: sm/certchain.c:791
-msgid "no issuer found in certificate"
-msgstr "sertifikacı kim belli değil"
-
-#: sm/certchain.c:820
+#: sm/certchain.c:799 sm/certchain.c:867
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "geçersiz doğrulukla sertifika: %s"
 
-#: sm/certchain.c:836
+#: sm/certchain.c:814 sm/certchain.c:899
 msgid "certificate not yet valid"
 msgstr "sertifika henüz geçersiz"
 
-#: sm/certchain.c:849
+#: sm/certchain.c:815 sm/certchain.c:900
+#, fuzzy
+msgid "root certificate not yet valid"
+msgstr "sertifika henüz geçersiz"
+
+#: sm/certchain.c:816 sm/certchain.c:901
+#, fuzzy
+msgid "intermediate certificate not yet valid"
+msgstr "sertifika henüz geçersiz"
+
+#: sm/certchain.c:829
 msgid "certificate has expired"
 msgstr "sertifika kullanım süresi dolmuş"
 
-#: sm/certchain.c:892
-msgid "self-signed certificate has a BAD signature"
-msgstr "öz-imzalı sertifika KÖTÜ bir imzaya sahip"
+#: sm/certchain.c:830
+#, fuzzy
+msgid "root certificate has expired"
+msgstr "sertifika kullanım süresi dolmuş"
 
-#: sm/certchain.c:960
-msgid "root certificate is not marked trusted"
-msgstr "kök sertifika güvenilir olarak imli değil"
+#: sm/certchain.c:831
+#, fuzzy
+msgid "intermediate certificate has expired"
+msgstr "sertifika kullanım süresi dolmuş"
+
+#: sm/certchain.c:873
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
+msgstr ""
+
+#: sm/certchain.c:882
+#, fuzzy
+msgid "certificate with invalid validity"
+msgstr "geçersiz doğrulukla sertifika: %s"
+
+#: sm/certchain.c:919
+#, fuzzy
+msgid "signature not created during lifetime of certificate"
+msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
+
+#: sm/certchain.c:921
+msgid "certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:922
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:926
+#, fuzzy
+msgid "  (  signature created at "
+msgstr "    temizlenen imzalar: %lu\n"
+
+#: sm/certchain.c:927
+#, fuzzy
+msgid "  (certificate created at "
+msgstr "Yürürlükten kaldırma sertifikası üretildi.\n"
+
+#: sm/certchain.c:930
+#, fuzzy
+msgid "  (certificate valid from "
+msgstr "sertifika henüz geçersiz"
+
+#: sm/certchain.c:931
+#, fuzzy
+msgid "  (     issuer valid from "
+msgstr "      Kart seri no. ="
 
-#: sm/certchain.c:975
+#: sm/certchain.c:961
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "parmakizi=%s\n"
 
-#: sm/certchain.c:983
+#: sm/certchain.c:970
 msgid "root certificate has now been marked as trusted\n"
 msgstr "kök sertifika artık güvenilir olarak imlenmiş oldu\n"
 
-#: sm/certchain.c:998
+#: sm/certchain.c:983
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "güvenilir olarak etkileşimli imleme gpg-agent'ta etkin değil\n"
 
-#: sm/certchain.c:1004
+#: sm/certchain.c:989
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "güvenilir olarak etkileşimli imleme bu oturum için iptal edildi\n"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1046
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr ""
+
+#: sm/certchain.c:1110
+msgid "no issuer found in certificate"
+msgstr "sertifikacı kim belli değil"
+
+#: sm/certchain.c:1184
+msgid "self-signed certificate has a BAD signature"
+msgstr "öz-imzalı sertifika KÖTÜ bir imzaya sahip"
+
+#: sm/certchain.c:1253
+msgid "root certificate is not marked trusted"
+msgstr "kök sertifika güvenilir olarak imli değil"
+
+#: sm/certchain.c:1266
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "güvence listesinin sınanması başarısız: %s\n"
 
-#: sm/certchain.c:1041 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr "sertifika zinciri çok uzun\n"
 
-#: sm/certchain.c:1053
+#: sm/certchain.c:1307
 msgid "issuer certificate not found"
 msgstr "sertifikacı belli değil"
 
-#: sm/certchain.c:1086
+#: sm/certchain.c:1340
 msgid "certificate has a BAD signature"
 msgstr "sertifika KÖTÜ bir imzaya sahip"
 
-#: sm/certchain.c:1116
+#: sm/certchain.c:1371
 msgid "found another possible matching CA certificate - trying again"
 msgstr "başka bir eşleşmesi olası CA sertifikası var - tekrar deneniyor"
 
-#: sm/certchain.c:1167
+#: sm/certchain.c:1422
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "sertifika zinciri CA tarafından izin verilenden uzun (%d)"
 
+#: sm/certchain.c:1462 sm/certchain.c:1730
+#, fuzzy
+msgid "certificate is good\n"
+msgstr "sertifika zinciri çok uzun\n"
+
+#: sm/certchain.c:1463
+#, fuzzy
+msgid "intermediate certificate is good\n"
+msgstr "yinelenmiş sertifika `%s' silindi\n"
+
+#: sm/certchain.c:1464
+#, fuzzy
+msgid "root certificate is good\n"
+msgstr "kök sertifika güvenilir olarak imli değil"
+
+#: sm/certchain.c:1620
+msgid "switching to chain model"
+msgstr ""
+
+#: sm/certchain.c:1629
+#, c-format
+msgid "validation model used: %s"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "chain model"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "shell model"
+msgstr ""
+
 #: sm/certcheck.c:101
 #, fuzzy, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
@@ -6874,11 +7001,11 @@ msgid "[Error - invalid DN]"
 msgstr "[Hata - DN geçersiz]"
 
 #: sm/certdump.c:936
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
 "\"%s\"\n"
-"S/N %s, ID %08lX, created %s"
+"S/N %s, ID 0x%08lX, created %s"
 msgstr ""
 "Bu gizli anahtarı açacak anahtar parolasını lütfen giriniz:\n"
 "\"%s\"\n"
@@ -6888,7 +7015,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr "hiç anahtar kullanımı belirtilmemiş - tüm kullanımlar var sayılıyor\n"
 
-#: sm/certlist.c:131 sm/keylist.c:255
+#: sm/certlist.c:131 sm/keylist.c:258
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "anahtar kullanım bilgisi alınırken hata: %s\n"
@@ -7009,171 +7136,171 @@ msgstr "geçici dosya oluşturulurken hata: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "geçeci dosyaya yazma hatası: %s\n"
 
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:244
 msgid "|[FILE]|make a signature"
 msgstr "|[DOSYA]|bir imza yapar"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:245
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[DOSYA]|açıkça okunabilen bir imza yapar"
 
-#: sm/gpgsm.c:251
+#: sm/gpgsm.c:253
 msgid "list external keys"
 msgstr "harici anahtarları listeler"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 msgid "list certificate chain"
 msgstr "sertifika zincirini listeler"
 
-#: sm/gpgsm.c:256
+#: sm/gpgsm.c:258
 msgid "remove key from the public keyring"
 msgstr "anahtarları genel anahtarlıktan kaldırır"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:261
 msgid "import certificates"
 msgstr "sertifikaları ithal eder"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:262
 msgid "export certificates"
 msgstr "sertifikaları ihraç eder"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 msgid "register a smartcard"
 msgstr "bir akıllı kartı kayda alır"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "pass a command to the dirmngr"
 msgstr "dirmngr'a bir komut aktarır"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "invoke gpg-protect-tool"
 msgstr "gpg-protect-tool'u çalıştırır"
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:268
 msgid "change a passphrase"
 msgstr "anahtar parolası değiştirir"
 
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
 msgid "create base-64 encoded output"
 msgstr "base-64 kodlu çıktı oluşturur"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:287
 msgid "assume input is in PEM format"
 msgstr "girdinin PEM biçiminde olduğu kabul edilir"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in base-64 format"
 msgstr "girdinin base-64 biçiminde olduğu kabul edilir"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in binary format"
 msgstr "girdinin ikilik biçimde olduğu kabul edilir"
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:296
 msgid "use system's dirmngr if available"
 msgstr "elverişliyse sistemin dirmngr'ı kullanılır"
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "never consult a CRL"
 msgstr "asla bir CRL sormaz"
 
-#: sm/gpgsm.c:302
+#: sm/gpgsm.c:304
 msgid "check validity using OCSP"
 msgstr "doğruluğu OCSP kullarak sınar"
 
-#: sm/gpgsm.c:305
+#: sm/gpgsm.c:309
 msgid "|N|number of certificates to include"
 msgstr "|N|içerilecek sertifika sayısı"
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:312
 msgid "|FILE|take policy information from FILE"
 msgstr "|DOSYA|poliçe bilgisi DOSYAdan alınır"
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:315
 msgid "do not check certificate policies"
 msgstr "sertifika poliçeleri sınanmaz"
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:319
 msgid "fetch missing issuer certificates"
 msgstr "kayıp sertifikacı sertifikalarını alır"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:323
 msgid "|NAME|use NAME as default recipient"
 msgstr "|İSİM|öntanımlı alıcı olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:325
 msgid "use the default key as default recipient"
 msgstr "öntanımlı alıcı olarak öntanımlı anahtar kullanılır"
 
-#: sm/gpgsm.c:338
+#: sm/gpgsm.c:342
 msgid "don't use the terminal at all"
 msgstr "terminali hiç kullanma"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:346
 msgid "force v3 signatures"
 msgstr "v3 imzalarına zorlar"
 
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:347
 msgid "always use a MDC for encryption"
 msgstr "şifreleme için daima bir MDC kullanılır"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:352
 msgid "batch mode: never ask"
 msgstr "önceden belirlenmiş işlemler kipi: hiç sormaz"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:353
 msgid "assume yes on most questions"
 msgstr "soruların çoğunda cevap evet farzedilir"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:354
 msgid "assume no on most questions"
 msgstr "soruların çoğunda cevap hayır farzedilir"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:356
 msgid "add this keyring to the list of keyrings"
 msgstr "bu anahtarlığı anahtarlık listesine ekler"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:357
 msgid "add this secret keyring to the list"
 msgstr "bu gizli anahtarlığı listeye ekler"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
 msgid "|NAME|use NAME as default secret key"
 msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:359
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|MAKİNA|anahtarları aramak için bu anahtar sunucusu kullanılır"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:360
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|İSİM|terminal karakter setini İSİM olarak ayarlar"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:364
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LDÜZEY|hata ayıklama düzeyini DÜZEY yapar"
 
-#: sm/gpgsm.c:375
+#: sm/gpgsm.c:379
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSYA|genişletme modülü olarak DOSYA yüklenir"
 
-#: sm/gpgsm.c:381
+#: sm/gpgsm.c:385
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|İSİM|şifre algoritması olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:387
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|İSİM|özümleme algoritması olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:389
 msgid "|N|use compress algorithm N"
 msgstr "|N|sıkıştırma algoritması olarak N kullanılır"
 
-#: sm/gpgsm.c:522
+#: sm/gpgsm.c:528
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Kullanımı: gpgsm [seçenekler] [dosyalar] (yardım için -h)"
 
-#: sm/gpgsm.c:525
+#: sm/gpgsm.c:531
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7183,30 +7310,35 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme S/MIME protokolü kullanarak yapılır\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: sm/gpgsm.c:604
+#: sm/gpgsm.c:610
 msgid "usage: gpgsm [options] "
 msgstr "kullanımı: gpgsm [seçenekler] "
 
-#: sm/gpgsm.c:685
+#: sm/gpgsm.c:691
 #, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "`%s'e şifrelenemez: %s\n"
 
-#: sm/gpgsm.c:1237
+#: sm/gpgsm.c:713
+#, fuzzy, c-format
+msgid "unknown validation model `%s'\n"
+msgstr "`%s' seçeneği bilinmiyor\n"
+
+#: sm/gpgsm.c:1264
 msgid "WARNING: running with faked system time: "
 msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
 
-#: sm/gpgsm.c:1316
+#: sm/gpgsm.c:1344
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "ortak sertifikalar `%s' ithal ediliyor\n"
 
-#: sm/gpgsm.c:1334
+#: sm/gpgsm.c:1362
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "`%s' kullanarak imzalanamıyor: %s\n"
 
-#: sm/gpgsm.c:1529
+#: sm/gpgsm.c:1543
 msgid "this command has not yet been implemented\n"
 msgstr "bu komut henüz gerçeklenmedi\n"
 
@@ -7228,7 +7360,7 @@ msgstr "temel sertifika sınamaları başarısız oldu - ithal edilmedi\n"
 msgid "error importing certificate: %s\n"
 msgstr "sertifika ithal edilirken hata: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:375
+#: sm/import.c:541 tools/gpg-connect-agent.c:374
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "girdi okunurken hata: %s\n"
@@ -7315,7 +7447,7 @@ msgstr ""
 "\n"
 "%s%sBunu yapmak istediğinizden emin misiniz?"
 
-#: sm/qualified.c:234
+#: sm/qualified.c:234 sm/verify.c:536
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7339,27 +7471,32 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "nitelikli sertifika için sınama başarısız: %s\n"
 
-#: sm/verify.c:386
+#: sm/verify.c:388
 msgid "Signature made "
 msgstr "İmza "
 
-#: sm/verify.c:390
+#: sm/verify.c:392
 msgid "[date not given]"
 msgstr "[belirtilmeyen tarihte]"
 
-#: sm/verify.c:391
-#, c-format
-msgid " using certificate ID %08lX\n"
+#: sm/verify.c:393
+#, fuzzy, c-format
+msgid " using certificate ID 0x%08lX\n"
 msgstr " sertifika kimliği %08lX kullanılarak yapıldı\n"
 
-#: sm/verify.c:507
+#: sm/verify.c:514
 msgid "Good signature from"
 msgstr "Buradaki imzeler iyi:"
 
-#: sm/verify.c:508
+#: sm/verify.c:515
 msgid "                aka"
 msgstr "        nam-ı diğer"
 
+#: sm/verify.c:533
+#, fuzzy
+msgid "This is a qualified signature\n"
+msgstr "Bu bir öz-imza olacak.\n"
+
 #: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 msgid "quiet"
 msgstr "sessiz"
@@ -7396,132 +7533,137 @@ msgstr ""
 "Sözdizimi: gpg-connect-agent [seçenekler]\n"
 "Çalışan bir aracıya bağlanıp komutları gönderir\n"
 
-#: tools/gpg-connect-agent.c:315
+#: tools/gpg-connect-agent.c:314
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "\"%s\" seçeneği bir program ve seçimlik argümanlar gerektirir\n"
 
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:323
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "\"%2$s\" nedeniyle \"%1$s\" seçeneği yoksayıldı\n"
 
-#: tools/gpg-connect-agent.c:382
+#: tools/gpg-connect-agent.c:381
 msgid "line too long - skipped\n"
 msgstr "satır çok uzun - atlandı\n"
 
-#: tools/gpg-connect-agent.c:386
+#: tools/gpg-connect-agent.c:385
 msgid "line shortened due to embedded Nul character\n"
 msgstr "gömülü boş karakterden dolayı satır kısaldı\n"
 
-#: tools/gpg-connect-agent.c:458
+#: tools/gpg-connect-agent.c:457
 #, c-format
 msgid "unknown command `%s'\n"
 msgstr "komut `%s' bilinmiyor\n"
 
-#: tools/gpg-connect-agent.c:466
+#: tools/gpg-connect-agent.c:465
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "satır göndirimi başarısız: %s\n"
 
-#: tools/gpg-connect-agent.c:474
+#: tools/gpg-connect-agent.c:473
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "satır alımı başarısız: %s\n"
 
-#: tools/gpg-connect-agent.c:784
+#: tools/gpg-connect-agent.c:789
 #, c-format
 msgid "error sending %s command: %s\n"
 msgstr "%s komutu gönderilirken hata: %s\n"
 
-#: tools/gpg-connect-agent.c:793
+#: tools/gpg-connect-agent.c:798
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "standart seçenekler gönderilirken hata: %s\n"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
 msgid "Options controlling the diagnostic output"
 msgstr "Tanı çıktısını denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
+#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
 msgid "Options controlling the configuration"
 msgstr "Yapılandırmayı denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
-#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
+#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
 msgid "Options useful for debugging"
 msgstr "Hata ayıklamaya elverişli seçenekler"
 
-#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
-#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
 
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
 msgid "Options controlling the security"
 msgstr "Güvenliği denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:501
+#: tools/gpgconf-comp.c:492
 #, fuzzy
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
 
-#: tools/gpgconf-comp.c:505
+#: tools/gpgconf-comp.c:496
 #, fuzzy
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
 
-#: tools/gpgconf-comp.c:509
+#: tools/gpgconf-comp.c:500
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:510
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:638
+#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#, fuzzy
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|İSİM|İSİM için şifreleme yapar"
+
+#: tools/gpgconf-comp.c:635
 msgid "Configuration for Keyservers"
 msgstr "Anahtar sunucular için yapılandırma"
 
-#: tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:640
 msgid "allow PKA lookups (DNS requests)"
 msgstr "PKA aramalarına izin verilir (DNS istekleri)"
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:685
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:705
+#: tools/gpgconf-comp.c:708
 msgid "do not check CRLs for root certificates"
 msgstr "kök sertifikalar için CRLler sınanmaz"
 
-#: tools/gpgconf-comp.c:749
+#: tools/gpgconf-comp.c:752
 msgid "Options controlling the format of the output"
 msgstr "Çıktı biçimini denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:785
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the interactivity and enforcement"
 msgstr "Etkileşimliliği ve zorlamayı denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
 msgid "Configuration for HTTP servers"
 msgstr "HTTP sunucuları için yapılandırma"
 
-#: tools/gpgconf-comp.c:806
+#: tools/gpgconf-comp.c:809
 msgid "use system's HTTP proxy setting"
 msgstr "sistemin HTTP vekil ayarları kullanılır"
 
-#: tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:814
 msgid "Configuration of LDAP servers to use"
 msgstr "Kullanılacak LDAP sunucularının yapılandırması"
 
-#: tools/gpgconf-comp.c:848
+#: tools/gpgconf-comp.c:851
 msgid "Configuration for OCSP"
 msgstr "OCSP için yapılandırma"
 
-#: tools/gpgconf-comp.c:2681
+#: tools/gpgconf-comp.c:2684
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 046aec060..5e2376487 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-07-05 18:01+0200\n"
+"POT-Creation-Date: 2007-08-10 15:49+0200\n"
 "PO-Revision-Date: 2006-07-02 10:58+0800\n"
 "Last-Translator: Meng Jie <zuxyhere@eastday.com>\n"
 "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
@@ -24,54 +24,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "无法存储指纹：%s\n"
 
-#: agent/call-pinentry.c:426
+#: agent/call-pinentry.c:436
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:429
+#: agent/call-pinentry.c:439
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/call-pinentry.c:476
+#: agent/call-pinentry.c:486
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
+#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
 #, fuzzy
 msgid "PIN too long"
 msgstr "列太长"
 
-#: agent/call-pinentry.c:497
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "列太长"
 
-#: agent/call-pinentry.c:505
+#: agent/call-pinentry.c:515
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "姓名含有无效的字符\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:520
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:522
+#: agent/call-pinentry.c:532
 #, fuzzy
 msgid "Bad PIN"
 msgstr "损坏的多精度整数(MPI)"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:533
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "错误的密码"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:569
 #, fuzzy
 msgid "Passphrase"
 msgstr "错误的密码"
@@ -88,14 +88,14 @@ msgstr "不支持保护散列 %d\n"
 msgid "can't create `%s': %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
 #: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
-#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1796
+#: sm/gpgsm.c:1833 sm/gpgsm.c:1871 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "无法打开‘%s’： %s\n"
@@ -182,35 +182,46 @@ msgstr[1] ""
 msgid "Take this one anyway"
 msgstr "无论如何还是使用这把密钥吗？(y/N)"
 
-#: agent/genkey.c:99
+#: agent/genkey.c:99 agent/genkey.c:114
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "请输入密码\n"
 
-#: agent/genkey.c:144
+#: agent/genkey.c:107
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+
+#: agent/genkey.c:113
+msgid "Yes, protection is not needed"
+msgstr ""
+
+#: agent/genkey.c:158
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "您需要一个密码来保护您的私钥。\n"
 "\n"
 
-#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
+#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "更改密码"
 
-#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
 #: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:263
+#: agent/genkey.c:280
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "更改密码"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -220,105 +231,105 @@ msgstr ""
 "选项：\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:103
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
-#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
 #: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "详细模式"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
-#: sm/gpgsm.c:337
+#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "尽量减少提示信息"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:109
+#: agent/gpg-agent.c:118 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "从‘%s’读取选项\n"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:119
+#: agent/gpg-agent.c:125 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:125
+#: agent/gpg-agent.c:126
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "在公钥服务器上搜寻密钥"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:129
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "为所选用户标识的设定注记"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "导入后不更新信任度数据库"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:145
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:206 sm/gpgsm.c:525 tools/gpg-connect-agent.c:124
 #: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
@@ -326,143 +337,143 @@ msgstr ""
 "请向 <gnupg-bugs@gnu.org> 报告程序缺陷。\n"
 "请向 <zuxyhere@eastday.com> 反映简体中文翻译的问题。\n"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:262
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
+#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
-#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:340 sm/gpgsm.c:772 sm/gpgsm.c:775 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
+#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:863
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "注意：没有默认配置文件‘%s’\n"
 
-#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
-#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: scd/scdaemon.c:421 sm/gpgsm.c:867 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
+#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:874
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
 
-#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "建立‘%s’时发生错误：%s\n"
 
-#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
-#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:921
+#: agent/gpg-agent.c:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
+#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:908
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
+#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
+#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 
-#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
+#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
 
-#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
+#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "已创建目录‘%s’\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1377
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) 在 %s 中出错：%s\n"
 
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1381
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1497
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1519
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
+#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "更新私钥失败：%s\n"
 
-#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
+#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s：已跳过：%s\n"
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1752
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:751
+#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
 
-#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
-#: tools/gpg-connect-agent.c:762
+#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "不支持 gpg-agent 协议版本 %d\n"
@@ -527,42 +538,42 @@ msgstr "生成密码的时候发生错误：%s\n"
 msgid "cancelled\n"
 msgstr "已取消"
 
-#: agent/trustlist.c:131 agent/trustlist.c:319
+#: agent/trustlist.c:132 agent/trustlist.c:322
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "‘%s’中出错：%s\n"
 
-#: agent/trustlist.c:146
+#: agent/trustlist.c:147
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: agent/trustlist.c:166 agent/trustlist.c:174
+#: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:180
+#: agent/trustlist.c:181
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "私钥部分不可用\n"
 
-#: agent/trustlist.c:215
+#: agent/trustlist.c:216
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "读取‘%s’错误：%s\n"
 
-#: agent/trustlist.c:241 agent/trustlist.c:248
+#: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:280
+#: agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: agent/trustlist.c:381 agent/trustlist.c:420
+#: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -575,7 +586,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:496
+#: agent/trustlist.c:507
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -585,7 +596,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:505
+#: agent/trustlist.c:516
 msgid "Correct"
 msgstr ""
 
@@ -597,58 +608,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:525
+#: agent/trustlist.c:536
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 #, fuzzy
 msgid "Yes"
 msgstr "yes"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:393
+#: common/exechelp.c:302 common/exechelp.c:390
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: common/exechelp.c:369 common/exechelp.c:426
+#: common/exechelp.c:366 common/exechelp.c:423
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "无法打开有签名的数据‘%s’\n"
 
-#: common/exechelp.c:405 common/exechelp.c:635
+#: common/exechelp.c:402 common/exechelp.c:632
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: common/exechelp.c:461 common/exechelp.c:504
+#: common/exechelp.c:458 common/exechelp.c:501
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:469
+#: common/exechelp.c:466
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "取得当前密钥信息时出错：%s\n"
 
-#: common/exechelp.c:475 common/exechelp.c:515
+#: common/exechelp.c:472 common/exechelp.c:512
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: common/exechelp.c:510
+#: common/exechelp.c:507
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:521
+#: common/exechelp.c:518
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "读取‘%s’时出错：%s\n"
@@ -667,25 +678,25 @@ msgstr "[找不到用户标识]"
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: common/simple-pwquery.c:376
+#: common/simple-pwquery.c:373
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "无法连接至‘%s’：%s\n"
 
-#: common/simple-pwquery.c:387
+#: common/simple-pwquery.c:384
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:397
+#: common/simple-pwquery.c:394
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+#: common/simple-pwquery.c:557 common/simple-pwquery.c:653
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "用户取消\n"
 
-#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+#: common/simple-pwquery.c:572 common/simple-pwquery.c:659
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "代理程序有问题――正在停用代理程序\n"
@@ -860,7 +871,7 @@ msgstr "找不到有效的 OpenPGP 数据。\n"
 msgid "not human readable"
 msgstr ""
 
-#: g10/card-util.c:62 g10/card-util.c:305
+#: g10/card-util.c:62 g10/card-util.c:308
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP 卡不可用：%s\n"
@@ -870,153 +881,153 @@ msgstr "OpenPGP 卡不可用：%s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "检测到 OpenPGP 卡号 %s\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1391 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "在批处理模式中无法完成此操作\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
 #: g10/keygen.c:1644
 msgid "Your selection? "
 msgstr "您的选择？ "
 
-#: g10/card-util.c:215 g10/card-util.c:265
+#: g10/card-util.c:218 g10/card-util.c:268
 msgid "[not set]"
 msgstr "[未设定]"
 
-#: g10/card-util.c:412
+#: g10/card-util.c:415
 msgid "male"
 msgstr "男性"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "female"
 msgstr "女性"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "unspecified"
 msgstr "未定义"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "not forced"
 msgstr "可选"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "forced"
 msgstr "必须"
 
-#: g10/card-util.c:518
+#: g10/card-util.c:521
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "错误：目前只允许使用 ASCII 字符。\n"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:523
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "错误：不能使用字符“<”。\n"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:525
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "错误：不允许出现两个空格。\n"
 
-#: g10/card-util.c:539
+#: g10/card-util.c:542
 msgid "Cardholder's surname: "
 msgstr "卡持有人的姓："
 
-#: g10/card-util.c:541
+#: g10/card-util.c:544
 msgid "Cardholder's given name: "
 msgstr "卡持有人的名："
 
-#: g10/card-util.c:559
+#: g10/card-util.c:562
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "错误：合成的姓名太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:580
+#: g10/card-util.c:583
 msgid "URL to retrieve public key: "
 msgstr "获取公钥的 URL："
 
-#: g10/card-util.c:588
+#: g10/card-util.c:591
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "错误：URL 太长(至多 %d 个字符)\n"
 
-#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
+#: g10/card-util.c:689 g10/card-util.c:758 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: g10/card-util.c:694
+#: g10/card-util.c:697
 msgid "Login data (account name): "
 msgstr "登录数据(帐号名)："
 
-#: g10/card-util.c:704
+#: g10/card-util.c:707
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "错误：登录数据太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:763
+#: g10/card-util.c:766
 msgid "Private DO data: "
 msgstr "个人 DO 数据："
 
-#: g10/card-util.c:773
+#: g10/card-util.c:776
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "错误：个人 DO 太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:793
+#: g10/card-util.c:796
 msgid "Language preferences: "
 msgstr "首选语言："
 
-#: g10/card-util.c:801
+#: g10/card-util.c:804
 msgid "Error: invalid length of preference string.\n"
 msgstr "错误：首选项字符串长度无效。\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:813
 msgid "Error: invalid characters in preference string.\n"
 msgstr "错误：首选项字符串里有无效字符。\n"
 
-#: g10/card-util.c:831
+#: g10/card-util.c:834
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "性别(男性输入 M，女性输入 F，不指定输入空格)："
 
-#: g10/card-util.c:845
+#: g10/card-util.c:848
 msgid "Error: invalid response.\n"
 msgstr "错误：无效的响应。\n"
 
-#: g10/card-util.c:866
+#: g10/card-util.c:869
 msgid "CA fingerprint: "
 msgstr "CA 指纹："
 
-#: g10/card-util.c:889
+#: g10/card-util.c:892
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "错误：指纹格式无效。\n"
 
-#: g10/card-util.c:937
+#: g10/card-util.c:940
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "针对密钥的操作无法实现：%s\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:941
 msgid "not an OpenPGP card"
 msgstr "不是一个 OpenPGP 卡"
 
-#: g10/card-util.c:947
+#: g10/card-util.c:950
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "取得当前密钥信息时出错：%s\n"
 
-#: g10/card-util.c:1031
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr "替换已有的密钥？(y/N)"
 
-#: g10/card-util.c:1051 g10/card-util.c:1060
+#: g10/card-util.c:1054 g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "是否为加密密钥创建卡外的备份？(Y/n)"
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1075
 msgid "Replace existing keys? (y/N) "
 msgstr "替换已有的密钥？(y/N)"
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1084
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1027,120 +1038,120 @@ msgstr ""
 "  PIN = ‘%s’    管理员 PIN = ‘%s’\n"
 "您应当使用 --change-pin 命令来更改它们\n"
 
-#: g10/card-util.c:1115
+#: g10/card-util.c:1118
 msgid "Please select the type of key to generate:\n"
 msgstr "请选择您要使用的密钥种类：\n"
 
-#: g10/card-util.c:1117 g10/card-util.c:1194
+#: g10/card-util.c:1120 g10/card-util.c:1197
 msgid "   (1) Signature key\n"
 msgstr "  (1) 签名密钥\n"
 
-#: g10/card-util.c:1118 g10/card-util.c:1196
+#: g10/card-util.c:1121 g10/card-util.c:1199
 msgid "   (2) Encryption key\n"
 msgstr "  (2) 加密密钥\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1198
+#: g10/card-util.c:1122 g10/card-util.c:1201
 msgid "   (3) Authentication key\n"
 msgstr "  (3) 认证密钥\n"
 
-#: g10/card-util.c:1135 g10/card-util.c:1214 g10/keyedit.c:945
+#: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
 #: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "无效的选择。\n"
 
-#: g10/card-util.c:1191
+#: g10/card-util.c:1194
 msgid "Please select where to store the key:\n"
 msgstr "请选择在哪里存储密钥：\n"
 
-#: g10/card-util.c:1226
+#: g10/card-util.c:1229
 msgid "unknown key protection algorithm\n"
 msgstr "不支持的密钥保护算法\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1234
 msgid "secret parts of key are not available\n"
 msgstr "私钥部分不可用\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1239
 msgid "secret key already stored on a card\n"
 msgstr "私钥已存储在卡上\n"
 
-#: g10/card-util.c:1304 g10/keyedit.c:1362
+#: g10/card-util.c:1307 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "离开这个菜单"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1309
 msgid "show admin commands"
 msgstr "显示管理员命令"
 
-#: g10/card-util.c:1307 g10/keyedit.c:1365
+#: g10/card-util.c:1310 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "显示这份在线说明"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1312
 msgid "list all available data"
 msgstr "列出所有可用数据"
 
-#: g10/card-util.c:1312
+#: g10/card-util.c:1315
 msgid "change card holder's name"
 msgstr "更改卡持有人的姓名"
 
-#: g10/card-util.c:1313
+#: g10/card-util.c:1316
 msgid "change URL to retrieve key"
 msgstr "更改获取密钥的 URL"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1317
 msgid "fetch the key specified in the card URL"
 msgstr "根据卡中指定的 URL 获取密钥"
 
-#: g10/card-util.c:1315
+#: g10/card-util.c:1318
 msgid "change the login name"
 msgstr "更改登录名"
 
-#: g10/card-util.c:1316
+#: g10/card-util.c:1319
 msgid "change the language preferences"
 msgstr "更改首选语言首选"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1320
 msgid "change card holder's sex"
 msgstr "更改卡持有人的性别"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1321
 msgid "change a CA fingerprint"
 msgstr "更改一个 CA 指纹"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1322
 msgid "toggle the signature force PIN flag"
 msgstr "设定 PIN 签名是否必须"
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1323
 msgid "generate new keys"
 msgstr "生成新的密钥"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1324
 msgid "menu to change or unblock the PIN"
 msgstr "更改或解锁 PIN 的菜单"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1325
 msgid "verify the PIN and list all data"
 msgstr "验证 PIN 并列出所有数据"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1634
+#: g10/card-util.c:1445 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "命令> "
 
-#: g10/card-util.c:1480
+#: g10/card-util.c:1483
 msgid "Admin-only command\n"
 msgstr "仅供管理员使用的命令\n"
 
-#: g10/card-util.c:1511
+#: g10/card-util.c:1514
 msgid "Admin commands are allowed\n"
 msgstr "允许使用管理员命令\n"
 
-#: g10/card-util.c:1513
+#: g10/card-util.c:1516
 msgid "Admin commands are not allowed\n"
 msgstr "不允许使用管理员命令\n"
 
-#: g10/card-util.c:1587 g10/keyedit.c:2255
+#: g10/card-util.c:1590 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "无效的指令(尝试“help”)\n"
 
@@ -1148,7 +1159,7 @@ msgstr "无效的指令(尝试“help”)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中不起作用\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "无法打开‘%s’\n"
@@ -1435,7 +1446,7 @@ msgstr "使用子钥 %s 而非主钥 %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "密钥 %s：无相应公钥的私钥――已跳过\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1451,27 +1462,27 @@ msgstr "|[文件名]|生成一份签名"
 msgid "|[file]|make a clear text signature"
 msgstr "|[文件名]|生成一份明文签名"
 
-#: g10/gpg.c:372 sm/gpgsm.c:244
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "生成一份分离的签名"
 
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "加密数据"
 
-#: g10/gpg.c:375 sm/gpgsm.c:246
+#: g10/gpg.c:375 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "仅使用对称加密"
 
-#: g10/gpg.c:377 sm/gpgsm.c:247
+#: g10/gpg.c:377 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "解密数据(默认)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:248
+#: g10/gpg.c:379 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "验证签名"
 
-#: g10/gpg.c:381 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "列出密钥"
 
@@ -1483,11 +1494,11 @@ msgstr "列出密钥和签名"
 msgid "list and check key signatures"
 msgstr "列出并检查密钥签名"
 
-#: g10/gpg.c:385 sm/gpgsm.c:254
+#: g10/gpg.c:385 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "列出密钥和指纹"
 
-#: g10/gpg.c:386 sm/gpgsm.c:252
+#: g10/gpg.c:386 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "列出私钥"
 
@@ -1523,11 +1534,11 @@ msgstr "生成一份吊销证书"
 msgid "export keys"
 msgstr "导出密钥"
 
-#: g10/gpg.c:397 sm/gpgsm.c:257
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "把密钥导出到某个公钥服务器上"
 
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "从公钥服务器上导入密钥"
 
@@ -1563,11 +1574,11 @@ msgstr "更新信任度数据库"
 msgid "|algo [files]|print message digests"
 msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
 
-#: g10/gpg.c:430 sm/gpgsm.c:262
+#: g10/gpg.c:430 sm/gpgsm.c:264
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
 #: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1578,31 +1589,31 @@ msgstr ""
 "选项：\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:279
+#: g10/gpg.c:434 sm/gpgsm.c:281
 msgid "create ascii armored output"
 msgstr "输出经 ASCII 封装"
 
-#: g10/gpg.c:436 sm/gpgsm.c:291
+#: g10/gpg.c:436 sm/gpgsm.c:293
 msgid "|NAME|encrypt for NAME"
 msgstr "|某甲|为收件者“某甲”加密"
 
-#: g10/gpg.c:447 sm/gpgsm.c:327
+#: g10/gpg.c:447 sm/gpgsm.c:331
 msgid "use this user-id to sign or decrypt"
 msgstr "使用这个用户标识来签名或解密"
 
-#: g10/gpg.c:448 sm/gpgsm.c:330
+#: g10/gpg.c:448 sm/gpgsm.c:334
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:332
+#: g10/gpg.c:453 sm/gpgsm.c:336
 msgid "use canonical text mode"
 msgstr "使用标准的文本模式"
 
-#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "指定输出文件"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "不做任何改变"
 
@@ -1618,7 +1629,7 @@ msgstr "行为严格遵循 OpenPGP 定义"
 msgid "generate PGP 2.x compatible messages"
 msgstr "生成与 PGP 2.x 兼容的报文"
 
-#: g10/gpg.c:553 sm/gpgsm.c:393
+#: g10/gpg.c:553 sm/gpgsm.c:397
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1626,7 +1637,7 @@ msgstr ""
 "@\n"
 "(请参考在线说明以获得所有命令和选项的完整清单)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:396
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1666,7 +1677,7 @@ msgstr ""
 "签名、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:532
+#: g10/gpg.c:781 sm/gpgsm.c:538
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1694,7 +1705,7 @@ msgstr "压缩："
 msgid "usage: gpg [options] "
 msgstr "用法：gpg [选项] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:669
+#: g10/gpg.c:1045 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "冲突的指令\n"
 
@@ -1770,444 +1781,444 @@ msgstr "警告：扩展模块‘%s’的关闭目录权限不安全\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的配置项‘%s’\n"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr "列出密钥时显示用户标识"
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr "列出签名时显示策略 URL"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1544
 msgid "show all notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr "列出签名时显示用户提供的注记"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1552
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出密钥时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr "列出密钥时显示用户标识的有效性"
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出密钥时显示已吊销或已过期的用户标识"
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1560
 msgid "show the keyring name in key listings"
 msgstr "列出密钥时显示钥匙环的名称"
 
-#: g10/gpg.c:1564
+#: g10/gpg.c:1562
 msgid "show expiration dates during signature listings"
 msgstr "列出签名时显示过期日期"
 
-#: g10/gpg.c:1827
+#: g10/gpg.c:1825
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1981
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n"
 
-#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
+#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "注意：一般情况下不会用到 %s！\n"
 
-#: g10/gpg.c:2401 g10/gpg.c:2413
+#: g10/gpg.c:2399 g10/gpg.c:2411
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "‘%s’不是一个有效的签名过期日期\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2493
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4084
+#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2528
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s：%d：无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2531
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2538
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s：%d：无效的导入选项\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2541
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2548
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s：%d：无效的导出选项\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2551
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2558
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s：%d：无效的列表选项\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2561
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2569
 msgid "display photo IDs during signature verification"
 msgstr "验证签名时显示照片标识"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2571
 msgid "show policy URLs during signature verification"
 msgstr "验证签名时显示策略 URL"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2573
 msgid "show all notations during signature verification"
 msgstr "验证签名时显示所有注记"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2575
 msgid "show IETF standard notations during signature verification"
 msgstr "验证签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2579
 msgid "show user-supplied notations during signature verification"
 msgstr "验证签名时显示用户提供的注记"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2581
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "验证签名时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2583
 msgid "show user ID validity during signature verification"
 msgstr "验证签名时显示用户标识的有效性"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2585
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2587
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2589
 msgid "validate signatures with PKA data"
 msgstr "使用 PKA 数据验证签名的有效性"
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2591
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "提升带有有效 PKA 数据的签名的信任度"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2598
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s：%d：无效的校验选项\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2601
 msgid "invalid verify options\n"
 msgstr "无效的校验选项\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2608
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法把运行路径设成 %s\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2782
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s：%d：无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2787
+#: g10/gpg.c:2785
 msgid "invalid auto-key-locate list\n"
 msgstr "无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2873 sm/gpgsm.c:1220
+#: g10/gpg.c:2871 sm/gpgsm.c:1247
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程序可能会创建核心内存转储！\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2875
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告：%s 会使得 %s 失效\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2884
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不可与 %s 并用\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2887
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用无意义！\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2902
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
 
-#: g10/gpg.c:2918
+#: g10/gpg.c:2916
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "您只有在 --pgp2 模式下才能做分离式或明文签名\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2922
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下时，不能同时签名和加密\n"
 
-#: g10/gpg.c:2930
+#: g10/gpg.c:2928
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
 
-#: g10/gpg.c:2943
+#: g10/gpg.c:2941
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 
-#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
+#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1303
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的对称加密算法无效\n"
 
-#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
+#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1311
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3025
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的证书散列算法无效\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3040
 msgid "completes-needed must be greater than 0\n"
 msgstr "需要的完全可信签名数一定要大于 0\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3042
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需要的勉强可信签名数一定要大于 1\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3044
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "最大验证深度一定要介于 1 和 255 之间\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3046
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3048
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
 
-#: g10/gpg.c:3053
+#: g10/gpg.c:3051
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n"
 
-#: g10/gpg.c:3057
+#: g10/gpg.c:3055
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3062
 msgid "invalid default preferences\n"
 msgstr "无效的默认首选项\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3071
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人对称加密算法首选项\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3075
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人散列算法首选项\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3079
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/gpg.c:3114
+#: g10/gpg.c:3112
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚不能和 %s 并用\n"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3159
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3164
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
 
-#: g10/gpg.c:3171
+#: g10/gpg.c:3169
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
 
-#: g10/gpg.c:3263
+#: g10/gpg.c:3261
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "初始化信任度数据库失败：%s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3272
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
 
-#: g10/gpg.c:3295
+#: g10/gpg.c:3293
 msgid "--store [filename]"
 msgstr "--store [文件名]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3300
 msgid "--symmetric [filename]"
 msgstr "--symmetric [文件名]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3302
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3312
 msgid "--encrypt [filename]"
 msgstr "--encrypt [文件名]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3325
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [文件名]"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3327
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3332
+#: g10/gpg.c:3330
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3348
 msgid "--sign [filename]"
 msgstr "--sign [文件名]"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3361
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [文件名]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3376
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [文件名]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3378
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3381
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3401
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [文件名]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3410
 msgid "--clearsign [filename]"
 msgstr "--clearsign [文件名]"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3435
 msgid "--decrypt [filename]"
 msgstr "--decrypt [文件名]"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3443
 msgid "--sign-key user-id"
 msgstr "--sign-key 用户标识"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3447
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 用户标识"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3468
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 用户标识 [指令]"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3553
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "上传至公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥服务器接收失败：%s\n"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3557
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败：%s\n"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3568
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "搜寻公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3580
+#: g10/gpg.c:3578
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "从公钥服务器更新失败：%s\n"
 
-#: g10/gpg.c:3631
+#: g10/gpg.c:3629
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3639
+#: g10/gpg.c:3637
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3729
+#: g10/gpg.c:3727
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "无效的‘%s’散列算法\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3844
 msgid "[filename]"
 msgstr "[文件名]"
 
-#: g10/gpg.c:3850
+#: g10/gpg.c:3848
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始键入您的报文……\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4160
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的验证策略 URL 无效\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4162
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签名策略 URL 无效\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4195
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
@@ -2219,7 +2230,7 @@ msgstr "从这个钥匙环里取用密钥"
 msgid "make timestamp conflicts only a warning"
 msgstr "把时间戳矛盾仅视为警告"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:368
+#: g10/gpgv.c:75 sm/gpgsm.c:372
 msgid "|FD|write status info to this FD"
 msgstr "|FD|把状态信息写入文件描述符 FD"
 
@@ -6455,61 +6466,61 @@ msgstr "目前禁止通过此命令验证管理员 PIN\n"
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
 
-#: scd/scdaemon.c:105
+#: scd/scdaemon.c:108
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:357
+#: scd/scdaemon.c:114 sm/gpgsm.c:361
 #, fuzzy
 msgid "read options from file"
 msgstr "从‘%s’读取选项\n"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:124
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:126
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:129
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:134
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:135
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "显示管理员命令"
 
-#: scd/scdaemon.c:206
+#: scd/scdaemon.c:209
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: scd/scdaemon.c:208
+#: scd/scdaemon.c:211
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:671
+#: scd/scdaemon.c:658
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1019
+#: scd/scdaemon.c:1006
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1024
+#: scd/scdaemon.c:1011
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6538,143 +6549,257 @@ msgstr "不支持 gpg-agent 协议版本 %d\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:174
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr ""
+
+#: sm/certchain.c:195
+msgid "chain"
+msgstr ""
+
+#: sm/certchain.c:196
+msgid "shell"
+msgstr ""
+
+#: sm/certchain.c:241
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "不支持 gpg-agent 协议版本 %d\n"
 
-#: sm/certchain.c:212
+#: sm/certchain.c:279
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:250
+#: sm/certchain.c:317
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:260
+#: sm/certchain.c:327
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "无法打开‘%s’：%s\n"
 
-#: sm/certchain.c:267 sm/certchain.c:296
+#: sm/certchain.c:334 sm/certchain.c:363
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:271 sm/certchain.c:300
+#: sm/certchain.c:338 sm/certchain.c:367
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "不允许导出私钥\n"
 
-#: sm/certchain.c:411
+#: sm/certchain.c:478
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:431
+#: sm/certchain.c:498
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "无法存储密钥：%s\n"
 
-#: sm/certchain.c:675
+#: sm/certchain.c:742
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "注意：密钥已被吊销"
 
-#: sm/certchain.c:684
+#: sm/certchain.c:752
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "证书已损坏"
 
-#: sm/certchain.c:688
+#: sm/certchain.c:757
+msgid "the status of the certificate is unknown"
+msgstr ""
+
+#: sm/certchain.c:762
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "可用的密钥在："
 
-#: sm/certchain.c:690
+#: sm/certchain.c:764
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:695
+#: sm/certchain.c:770
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "检查已建立的签名时发生错误： %s\n"
 
-#: sm/certchain.c:791
-#, fuzzy
-msgid "no issuer found in certificate"
-msgstr "生成一份吊销证书"
-
-#: sm/certchain.c:820
+#: sm/certchain.c:799 sm/certchain.c:867
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:836
+#: sm/certchain.c:814 sm/certchain.c:899
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:849
+#: sm/certchain.c:815 sm/certchain.c:900
+#, fuzzy
+msgid "root certificate not yet valid"
+msgstr "不允许导出私钥\n"
+
+#: sm/certchain.c:816 sm/certchain.c:901
+msgid "intermediate certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:829
 #, fuzzy
 msgid "certificate has expired"
 msgstr "这把密钥已经过期！"
 
-#: sm/certchain.c:892
-msgid "self-signed certificate has a BAD signature"
+#: sm/certchain.c:830
+#, fuzzy
+msgid "root certificate has expired"
+msgstr "这把密钥已经过期！"
+
+#: sm/certchain.c:831
+#, fuzzy
+msgid "intermediate certificate has expired"
+msgstr "这把密钥已经过期！"
+
+#: sm/certchain.c:873
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:960
-msgid "root certificate is not marked trusted"
+#: sm/certchain.c:882
+#, fuzzy
+msgid "certificate with invalid validity"
+msgstr "这把密钥已经过期！"
+
+#: sm/certchain.c:919
+msgid "signature not created during lifetime of certificate"
+msgstr ""
+
+#: sm/certchain.c:921
+msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:975
+#: sm/certchain.c:922
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:926
+#, fuzzy
+msgid "  (  signature created at "
+msgstr "      清除的签名：%lu\n"
+
+#: sm/certchain.c:927
+#, fuzzy
+msgid "  (certificate created at "
+msgstr "已建立吊销证书。\n"
+
+#: sm/certchain.c:930
+#, fuzzy
+msgid "  (certificate valid from "
+msgstr "证书已损坏"
+
+#: sm/certchain.c:931
+#, fuzzy
+msgid "  (     issuer valid from "
+msgstr "卡序列号 ="
+
+#: sm/certchain.c:961
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "CA 指纹："
 
-#: sm/certchain.c:983
+#: sm/certchain.c:970
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:998
+#: sm/certchain.c:983
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1004
+#: sm/certchain.c:989
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1046
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr ""
+
+#: sm/certchain.c:1110
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "生成一份吊销证书"
+
+#: sm/certchain.c:1184
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:1253
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:1266
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "检查已建立的签名时发生错误： %s\n"
 
-#: sm/certchain.c:1041 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1053
+#: sm/certchain.c:1307
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1086
+#: sm/certchain.c:1340
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "验证签名"
 
-#: sm/certchain.c:1116
+#: sm/certchain.c:1371
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1167
+#: sm/certchain.c:1422
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
+#: sm/certchain.c:1462 sm/certchain.c:1730
+#, fuzzy
+msgid "certificate is good\n"
+msgstr "首选项‘%s’重复\n"
+
+#: sm/certchain.c:1463
+#, fuzzy
+msgid "intermediate certificate is good\n"
+msgstr "已建立吊销证书。\n"
+
+#: sm/certchain.c:1464
+#, fuzzy
+msgid "root certificate is good\n"
+msgstr "证书已损坏"
+
+#: sm/certchain.c:1620
+msgid "switching to chain model"
+msgstr ""
+
+#: sm/certchain.c:1629
+#, c-format
+msgid "validation model used: %s"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "chain model"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "shell model"
+msgstr ""
+
 #: sm/certcheck.c:101
 #, fuzzy, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
@@ -6722,7 +6847,7 @@ msgstr "错误：无效的响应。\n"
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
 "\"%s\"\n"
-"S/N %s, ID %08lX, created %s"
+"S/N %s, ID 0x%08lX, created %s"
 msgstr ""
 "您需要这个用户的密码来解开私钥：\n"
 "“%.*s”\n"
@@ -6732,7 +6857,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:131 sm/keylist.c:255
+#: sm/certlist.c:131 sm/keylist.c:258
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "取得当前密钥信息时出错：%s\n"
@@ -6854,190 +6979,190 @@ msgstr "生成密码的时候发生错误：%s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "%s：写入目录记录时出错：%s\n"
 
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[文件名]|生成一份签名"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[文件名]|生成一份明文签名"
 
-#: sm/gpgsm.c:251
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list external keys"
 msgstr "列出私钥"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list certificate chain"
 msgstr "证书已损坏"
 
-#: sm/gpgsm.c:256
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "从公钥钥匙环里删除密钥"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "import certificates"
 msgstr "证书已损坏"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:262
 #, fuzzy
 msgid "export certificates"
 msgstr "证书已损坏"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 #, fuzzy
 msgid "register a smartcard"
 msgstr "在智能卡上添加一把密钥"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:268
 #, fuzzy
 msgid "change a passphrase"
 msgstr "更改密码"
 
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "输出经 ASCII 封装"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:287
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:296
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:302
+#: sm/gpgsm.c:304
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:305
+#: sm/gpgsm.c:309
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:312
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:315
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:319
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:323
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:325
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "已跳过：公钥已被设为默认收件者\n"
 
-#: sm/gpgsm.c:338
+#: sm/gpgsm.c:342
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:346
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "检查签名"
 
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:347
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:352
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:353
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:354
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:356
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "从这个钥匙环里取用密钥"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:357
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "要有私钥才能这么做。\n"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:359
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:360
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|某甲|为收件者“某甲”加密"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:364
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:375
+#: sm/gpgsm.c:379
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:381
+#: sm/gpgsm.c:385
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "未知的对称加密算法"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:387
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s 签名，散列算法 %s\n"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:389
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "未知的压缩算法"
 
-#: sm/gpgsm.c:522
+#: sm/gpgsm.c:528
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: sm/gpgsm.c:525
+#: sm/gpgsm.c:531
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7048,31 +7173,36 @@ msgstr ""
 "签名、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: sm/gpgsm.c:604
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "用法：gpg [选项] "
 
-#: sm/gpgsm.c:685
+#: sm/gpgsm.c:691
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "无法连接至‘%s’：%s\n"
 
-#: sm/gpgsm.c:1237
+#: sm/gpgsm.c:713
+#, fuzzy, c-format
+msgid "unknown validation model `%s'\n"
+msgstr "未知的选项 '%s'\n"
+
+#: sm/gpgsm.c:1264
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1316
+#: sm/gpgsm.c:1344
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1334
+#: sm/gpgsm.c:1362
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "无法存取‘%s’：%s\n"
 
-#: sm/gpgsm.c:1529
+#: sm/gpgsm.c:1543
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7095,7 +7225,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:375
+#: sm/import.c:541 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
@@ -7179,7 +7309,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234
+#: sm/qualified.c:234 sm/verify.c:536
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7198,30 +7328,35 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "检查已建立的签名时发生错误： %s\n"
 
-#: sm/verify.c:386
+#: sm/verify.c:388
 #, fuzzy
 msgid "Signature made "
 msgstr "签名建立于 %s\n"
 
-#: sm/verify.c:390
+#: sm/verify.c:392
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:391
-#, c-format
-msgid " using certificate ID %08lX\n"
-msgstr ""
+#: sm/verify.c:393
+#, fuzzy, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr "取得当前密钥信息时出错：%s\n"
 
-#: sm/verify.c:507
+#: sm/verify.c:514
 #, fuzzy
 msgid "Good signature from"
 msgstr "完好的签名，来自于“%s”"
 
-#: sm/verify.c:508
+#: sm/verify.c:515
 #, fuzzy
 msgid "                aka"
 msgstr "              亦即“%s”"
 
+#: sm/verify.c:533
+#, fuzzy
+msgid "This is a qualified signature\n"
+msgstr "这将是一个自身签名。\n"
+
 #: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
@@ -7258,131 +7393,136 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:315
+#: tools/gpg-connect-agent.c:314
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:323
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:382
+#: tools/gpg-connect-agent.c:381
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "列太长"
 
-#: tools/gpg-connect-agent.c:386
+#: tools/gpg-connect-agent.c:385
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:458
+#: tools/gpg-connect-agent.c:457
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "未知的选项 '%s'\n"
 
-#: tools/gpg-connect-agent.c:466
+#: tools/gpg-connect-agent.c:465
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "签名时失败： %s\n"
 
-#: tools/gpg-connect-agent.c:474
+#: tools/gpg-connect-agent.c:473
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "无法读出公钥：%s\n"
 
-#: tools/gpg-connect-agent.c:784
+#: tools/gpg-connect-agent.c:789
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: tools/gpg-connect-agent.c:793
+#: tools/gpg-connect-agent.c:798
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
+#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
-#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
+#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
-#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:501
+#: tools/gpgconf-comp.c:492
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:505
+#: tools/gpgconf-comp.c:496
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:509
+#: tools/gpgconf-comp.c:500
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:510
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:638
+#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#, fuzzy
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|某甲|为收件者“某甲”加密"
+
+#: tools/gpgconf-comp.c:635
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:640
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:685
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:705
+#: tools/gpgconf-comp.c:708
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:749
+#: tools/gpgconf-comp.c:752
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:785
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:806
+#: tools/gpgconf-comp.c:809
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:814
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:848
+#: tools/gpgconf-comp.c:851
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2681
+#: tools/gpgconf-comp.c:2684
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e777c30b5..bd7479b4d 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-07-05 18:01+0200\n"
+"POT-Creation-Date: 2007-08-10 15:49+0200\n"
 "PO-Revision-Date: 2005-07-29 09:49+0800\n"
 "Last-Translator: Jedi <Jedi@Jedi.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -22,54 +22,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "存放指紋失敗: %s\n"
 
-#: agent/call-pinentry.c:426
+#: agent/call-pinentry.c:436
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:429
+#: agent/call-pinentry.c:439
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: agent/call-pinentry.c:476
+#: agent/call-pinentry.c:486
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
+#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
 #, fuzzy
 msgid "PIN too long"
 msgstr "列太長"
 
-#: agent/call-pinentry.c:497
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "列太長"
 
-#: agent/call-pinentry.c:505
+#: agent/call-pinentry.c:515
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "姓名含有無效的字符\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:520
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:522
+#: agent/call-pinentry.c:532
 #, fuzzy
 msgid "Bad PIN"
 msgstr "損壞的 MPI"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:533
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "錯誤的密語"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:569
 #, fuzzy
 msgid "Passphrase"
 msgstr "錯誤的密語"
@@ -86,14 +86,14 @@ msgstr "保護摘要 %d 未被支援\n"
 msgid "can't create `%s': %s\n"
 msgstr "無法建立 `%s': %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
 #: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
-#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1796
+#: sm/gpgsm.c:1833 sm/gpgsm.c:1871 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
@@ -180,35 +180,46 @@ msgstr[1] ""
 msgid "Take this one anyway"
 msgstr "無論如何還是使用這把金鑰嗎? (y/N) "
 
-#: agent/genkey.c:99
+#: agent/genkey.c:99 agent/genkey.c:114
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "請輸入密語\n"
 
-#: agent/genkey.c:144
+#: agent/genkey.c:107
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+
+#: agent/genkey.c:113
+msgid "Yes, protection is not needed"
+msgstr ""
+
+#: agent/genkey.c:158
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "妳需要一個密語來保護妳的私鑰.\n"
 "\n"
 
-#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
+#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "更改密語"
 
-#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
 #: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:263
+#: agent/genkey.c:280
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "更改密語"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -218,247 +229,247 @@ msgstr ""
 "選項:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:103
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
-#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
 #: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "囉唆模式"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
-#: sm/gpgsm.c:337
+#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "盡量安靜些"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:109
+#: agent/gpg-agent.c:118 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "從 `%s' 讀取選項\n"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:119
+#: agent/gpg-agent.c:125 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:125
+#: agent/gpg-agent.c:126
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "在某個金鑰伺服器上搜尋金鑰"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:129
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "設定所選使用者 ID 的偏好清單"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "更新信任資料庫"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:145
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "建立密語的時候發生錯誤: %s\n"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:206 sm/gpgsm.c:525 tools/gpg-connect-agent.c:124
 #: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "請向 <gnupg-bugs@gnu.org> 回報程式瑕疵.\n"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:262
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
+#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
-#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:340 sm/gpgsm.c:772 sm/gpgsm.c:775 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
+#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:863
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "請注意: 沒有預設選項檔 `%s'\n"
 
-#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
-#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: scd/scdaemon.c:421 sm/gpgsm.c:867 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "選項檔 `%s': %s\n"
 
-#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
+#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:874
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "從 `%s' 讀取選項\n"
 
-#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "建立 `%s' 時發生錯誤: %s\n"
 
-#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
-#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:921
+#: agent/gpg-agent.c:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
+#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:908
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "無法建立目錄 `%s': %s\n"
 
-#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
+#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "無法建立 `%s': %s\n"
 
-#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent 在此階段無法使用\n"
 
-#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
+#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
 
-#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
+#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "正在將私鑰寫至 `%s'\n"
 
-#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
+#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "目錄 `%s' 已建立\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1377
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) 失敗於 %s: %s\n"
 
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1381
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "無法建立目錄 `%s': %s\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1492
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1497
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1519
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
+#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "更新私鑰失敗: %s\n"
 
-#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
+#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: 已跳過: %s\n"
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1752
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent 在此階段無法使用\n"
 
-#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:751
+#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "被變造的 GPG_AGENT_INFO 環境變數\n"
 
-#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
-#: tools/gpg-connect-agent.c:762
+#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent 協定版本 %d 未被支援\n"
@@ -523,42 +534,42 @@ msgstr "建立密語的時候發生錯誤: %s\n"
 msgid "cancelled\n"
 msgstr "已取消"
 
-#: agent/trustlist.c:131 agent/trustlist.c:319
+#: agent/trustlist.c:132 agent/trustlist.c:322
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "在 `%s' 中出錯: %s\n"
 
-#: agent/trustlist.c:146
+#: agent/trustlist.c:147
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "選項檔 `%s': %s\n"
 
-#: agent/trustlist.c:166 agent/trustlist.c:174
+#: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:180
+#: agent/trustlist.c:181
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "私鑰部分無法取用\n"
 
-#: agent/trustlist.c:215
+#: agent/trustlist.c:216
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "讀取 `%s' 錯誤: %s\n"
 
-#: agent/trustlist.c:241 agent/trustlist.c:248
+#: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:280
+#: agent/trustlist.c:283
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: agent/trustlist.c:381 agent/trustlist.c:420
+#: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -571,7 +582,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:496
+#: agent/trustlist.c:507
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -581,7 +592,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:505
+#: agent/trustlist.c:516
 msgid "Correct"
 msgstr ""
 
@@ -593,58 +604,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:525
+#: agent/trustlist.c:536
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 #, fuzzy
 msgid "Yes"
 msgstr "yes"
 
-#: agent/trustlist.c:531
+#: agent/trustlist.c:542
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:393
+#: common/exechelp.c:302 common/exechelp.c:390
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
 
-#: common/exechelp.c:369 common/exechelp.c:426
+#: common/exechelp.c:366 common/exechelp.c:423
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "無法開啟被簽署過的資料 `%s'\n"
 
-#: common/exechelp.c:405 common/exechelp.c:635
+#: common/exechelp.c:402 common/exechelp.c:632
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: common/exechelp.c:461 common/exechelp.c:504
+#: common/exechelp.c:458 common/exechelp.c:501
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:469
+#: common/exechelp.c:466
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "取得現用金鑰資訊時發生錯誤: %s\n"
 
-#: common/exechelp.c:475 common/exechelp.c:515
+#: common/exechelp.c:472 common/exechelp.c:512
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: common/exechelp.c:510
+#: common/exechelp.c:507
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:521
+#: common/exechelp.c:518
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
@@ -663,25 +674,25 @@ msgstr "[找不到使用者 ID]"
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent 在此階段無法使用\n"
 
-#: common/simple-pwquery.c:376
+#: common/simple-pwquery.c:373
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "無法連接至 `%s': %s\n"
 
-#: common/simple-pwquery.c:387
+#: common/simple-pwquery.c:384
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:397
+#: common/simple-pwquery.c:394
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
+#: common/simple-pwquery.c:557 common/simple-pwquery.c:653
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "由使用者取消了\n"
 
-#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
+#: common/simple-pwquery.c:572 common/simple-pwquery.c:659
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "代理程式的問題 - 正在停用代理程式\n"
@@ -855,7 +866,7 @@ msgstr "警告: 找到無效的標記資料\n"
 msgid "not human readable"
 msgstr "不是人類能讀得懂的"
 
-#: g10/card-util.c:62 g10/card-util.c:305
+#: g10/card-util.c:62 g10/card-util.c:308
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "沒有可用的 OpenPGP 卡片: %s\n"
@@ -865,153 +876,153 @@ msgstr "沒有可用的 OpenPGP 卡片: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "偵測到 OpenPGP 卡片編號 %s\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1391 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
 #: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "無法在批次模式中這樣做\n"
 
-#: g10/card-util.c:102 g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
 #: g10/keygen.c:1644
 msgid "Your selection? "
 msgstr "妳要選哪一個? "
 
-#: g10/card-util.c:215 g10/card-util.c:265
+#: g10/card-util.c:218 g10/card-util.c:268
 msgid "[not set]"
 msgstr "[未設定]"
 
-#: g10/card-util.c:412
+#: g10/card-util.c:415
 msgid "male"
 msgstr "男性"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "female"
 msgstr "女性"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:416
 msgid "unspecified"
 msgstr "未特定"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "not forced"
 msgstr "不強迫使用"
 
-#: g10/card-util.c:440
+#: g10/card-util.c:443
 msgid "forced"
 msgstr "強迫使用"
 
-#: g10/card-util.c:518
+#: g10/card-util.c:521
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "錯誤: 目前祇允許使用單純的 ASCII 字元.\n"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:523
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "錯誤: 不能使用 \"<\" 字元.\n"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:525
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "錯誤: 並不允許使用連續兩個以上的空格.\n"
 
-#: g10/card-util.c:539
+#: g10/card-util.c:542
 msgid "Cardholder's surname: "
 msgstr "卡片持有者的姓氏: "
 
-#: g10/card-util.c:541
+#: g10/card-util.c:544
 msgid "Cardholder's given name: "
 msgstr "卡片持有者的教名: "
 
-#: g10/card-util.c:559
+#: g10/card-util.c:562
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "錯誤: 合併後的名字太長 (上限是 %d 個字元).\n"
 
-#: g10/card-util.c:580
+#: g10/card-util.c:583
 msgid "URL to retrieve public key: "
 msgstr "取回公鑰的 URL: "
 
-#: g10/card-util.c:588
+#: g10/card-util.c:591
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "錯誤: URL 太長 (上限是 %d 個字元).\n"
 
-#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
+#: g10/card-util.c:689 g10/card-util.c:758 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: g10/card-util.c:694
+#: g10/card-util.c:697
 msgid "Login data (account name): "
 msgstr " 登入資料 (帳號名稱): "
 
-#: g10/card-util.c:704
+#: g10/card-util.c:707
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "錯誤: 登入資料太長 (上限是 %d 個字元).\n"
 
-#: g10/card-util.c:763
+#: g10/card-util.c:766
 msgid "Private DO data: "
 msgstr "私人的 DO 資料: "
 
-#: g10/card-util.c:773
+#: g10/card-util.c:776
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "錯誤: 私人的 DO 太長 (上限是 %d 個字元).\n"
 
-#: g10/card-util.c:793
+#: g10/card-util.c:796
 msgid "Language preferences: "
 msgstr "介面語言偏好設定: "
 
-#: g10/card-util.c:801
+#: g10/card-util.c:804
 msgid "Error: invalid length of preference string.\n"
 msgstr "錯誤: 偏好設定字串的長度無效\n"
 
-#: g10/card-util.c:810
+#: g10/card-util.c:813
 msgid "Error: invalid characters in preference string.\n"
 msgstr "錯誤: 偏好設定字串中含有無效的字元\n"
 
-#: g10/card-util.c:831
+#: g10/card-util.c:834
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "性別 ((M)ale, (F)emale 或留空): "
 
-#: g10/card-util.c:845
+#: g10/card-util.c:848
 msgid "Error: invalid response.\n"
 msgstr "錯誤: 無效的回應.\n"
 
-#: g10/card-util.c:866
+#: g10/card-util.c:869
 msgid "CA fingerprint: "
 msgstr "憑證中心 (CA) 指紋: "
 
-#: g10/card-util.c:889
+#: g10/card-util.c:892
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "錯誤: 指紋格式化無效.\n"
 
-#: g10/card-util.c:937
+#: g10/card-util.c:940
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "不可能進行金鑰操作: %s\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:941
 msgid "not an OpenPGP card"
 msgstr "這不是 OpenPGP 卡片"
 
-#: g10/card-util.c:947
+#: g10/card-util.c:950
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "取得現用金鑰資訊時發生錯誤: %s\n"
 
-#: g10/card-util.c:1031
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1051 g10/card-util.c:1060
+#: g10/card-util.c:1054 g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "是否要為加密用金鑰建立卡外備份? (Y/n) "
 
-#: g10/card-util.c:1072
+#: g10/card-util.c:1075
 msgid "Replace existing keys? (y/N) "
 msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1081
+#: g10/card-util.c:1084
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1022,120 +1033,120 @@ msgstr ""
 "   PIN = `%s'     管理者 (Admin) PIN = `%s'\n"
 "妳應該用 --change-pin 指令來加以變更\n"
 
-#: g10/card-util.c:1115
+#: g10/card-util.c:1118
 msgid "Please select the type of key to generate:\n"
 msgstr "請選擇妳要產生的金鑰種類:\n"
 
-#: g10/card-util.c:1117 g10/card-util.c:1194
+#: g10/card-util.c:1120 g10/card-util.c:1197
 msgid "   (1) Signature key\n"
 msgstr "   (1) 簽署用金鑰\n"
 
-#: g10/card-util.c:1118 g10/card-util.c:1196
+#: g10/card-util.c:1121 g10/card-util.c:1199
 msgid "   (2) Encryption key\n"
 msgstr "   (2) 加密用金鑰\n"
 
-#: g10/card-util.c:1119 g10/card-util.c:1198
+#: g10/card-util.c:1122 g10/card-util.c:1201
 msgid "   (3) Authentication key\n"
 msgstr "   (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1135 g10/card-util.c:1214 g10/keyedit.c:945
+#: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
 #: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "無效的選擇.\n"
 
-#: g10/card-util.c:1191
+#: g10/card-util.c:1194
 msgid "Please select where to store the key:\n"
 msgstr "請選擇要把金鑰存放在哪裡:\n"
 
-#: g10/card-util.c:1226
+#: g10/card-util.c:1229
 msgid "unknown key protection algorithm\n"
 msgstr "未知的金鑰保護演算法\n"
 
-#: g10/card-util.c:1231
+#: g10/card-util.c:1234
 msgid "secret parts of key are not available\n"
 msgstr "私鑰部分無法取用\n"
 
-#: g10/card-util.c:1236
+#: g10/card-util.c:1239
 msgid "secret key already stored on a card\n"
 msgstr "私鑰已經存放於卡片上了\n"
 
-#: g10/card-util.c:1304 g10/keyedit.c:1362
+#: g10/card-util.c:1307 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "離開這個選單"
 
-#: g10/card-util.c:1306
+#: g10/card-util.c:1309
 msgid "show admin commands"
 msgstr "顯示管理者指令"
 
-#: g10/card-util.c:1307 g10/keyedit.c:1365
+#: g10/card-util.c:1310 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "顯示這份線上說明"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1312
 msgid "list all available data"
 msgstr "列出所有可用的資料"
 
-#: g10/card-util.c:1312
+#: g10/card-util.c:1315
 msgid "change card holder's name"
 msgstr "變更卡片持有人的名字"
 
-#: g10/card-util.c:1313
+#: g10/card-util.c:1316
 msgid "change URL to retrieve key"
 msgstr "變更要取回金鑰的 URL"
 
-#: g10/card-util.c:1314
+#: g10/card-util.c:1317
 msgid "fetch the key specified in the card URL"
 msgstr "從卡片 URL 取回指定的金鑰"
 
-#: g10/card-util.c:1315
+#: g10/card-util.c:1318
 msgid "change the login name"
 msgstr "變更登入姓名"
 
-#: g10/card-util.c:1316
+#: g10/card-util.c:1319
 msgid "change the language preferences"
 msgstr "變更介面語言偏好設定"
 
-#: g10/card-util.c:1317
+#: g10/card-util.c:1320
 msgid "change card holder's sex"
 msgstr "變更卡片持有者的性別"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1321
 msgid "change a CA fingerprint"
 msgstr "變更某個憑證中心 (CA) 指紋"
 
-#: g10/card-util.c:1319
+#: g10/card-util.c:1322
 msgid "toggle the signature force PIN flag"
 msgstr "切換簽章強制個人識別碼 (PIN) 的旗標"
 
-#: g10/card-util.c:1320
+#: g10/card-util.c:1323
 msgid "generate new keys"
 msgstr "產生新的金鑰"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1324
 msgid "menu to change or unblock the PIN"
 msgstr "變更或解凍個人識別碼 (PIN) 的選單"
 
-#: g10/card-util.c:1322
+#: g10/card-util.c:1325
 msgid "verify the PIN and list all data"
 msgstr "驗證個人識別碼 (PIN) 並列出所有的資料"
 
-#: g10/card-util.c:1442 g10/keyedit.c:1634
+#: g10/card-util.c:1445 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "指令> "
 
-#: g10/card-util.c:1480
+#: g10/card-util.c:1483
 msgid "Admin-only command\n"
 msgstr "限管理者使用的指令\n"
 
-#: g10/card-util.c:1511
+#: g10/card-util.c:1514
 msgid "Admin commands are allowed\n"
 msgstr "允許使用管理者指令\n"
 
-#: g10/card-util.c:1513
+#: g10/card-util.c:1516
 msgid "Admin commands are not allowed\n"
 msgstr "未允許使用管理者指令\n"
 
-#: g10/card-util.c:1587 g10/keyedit.c:2255
+#: g10/card-util.c:1590 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無效的指令  (試試看 \"help\")\n"
 
@@ -1143,7 +1154,7 @@ msgstr "無效的指令  (試試看 \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在這個命令中沒有作用\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "無法開啟 `%s'\n"
@@ -1434,7 +1445,7 @@ msgstr "正在使用次鑰 %s 來替換主鑰 %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "金鑰 %s: 祇有私鑰而沒有公鑰 - 已跳過\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1450,27 +1461,27 @@ msgstr "|[檔案]|建立一份簽章"
 msgid "|[file]|make a clear text signature"
 msgstr "|[檔案]|建立一份明文簽章"
 
-#: g10/gpg.c:372 sm/gpgsm.c:244
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "建立一份分離式簽章"
 
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "加密資料"
 
-#: g10/gpg.c:375 sm/gpgsm.c:246
+#: g10/gpg.c:375 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "僅使用對稱式編密法來加密"
 
-#: g10/gpg.c:377 sm/gpgsm.c:247
+#: g10/gpg.c:377 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "資料解密 (預設)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:248
+#: g10/gpg.c:379 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "驗證某份簽章"
 
-#: g10/gpg.c:381 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "列出金鑰"
 
@@ -1482,11 +1493,11 @@ msgstr "列出金鑰和簽章"
 msgid "list and check key signatures"
 msgstr "列出並檢查金鑰簽章"
 
-#: g10/gpg.c:385 sm/gpgsm.c:254
+#: g10/gpg.c:385 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "列出金鑰和指紋"
 
-#: g10/gpg.c:386 sm/gpgsm.c:252
+#: g10/gpg.c:386 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "列出私鑰"
 
@@ -1522,11 +1533,11 @@ msgstr "產生一份撤銷憑證"
 msgid "export keys"
 msgstr "匯出金鑰"
 
-#: g10/gpg.c:397 sm/gpgsm.c:257
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "把金鑰匯出至某個金鑰伺服器上"
 
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "從某個金鑰伺服器上匯入金鑰"
 
@@ -1562,11 +1573,11 @@ msgstr "更新信任資料庫"
 msgid "|algo [files]|print message digests"
 msgstr "|演算法 [檔案]|印出訊息摘要"
 
-#: g10/gpg.c:430 sm/gpgsm.c:262
+#: g10/gpg.c:430 sm/gpgsm.c:264
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
 #: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1577,31 +1588,31 @@ msgstr ""
 "選項:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:279
+#: g10/gpg.c:434 sm/gpgsm.c:281
 msgid "create ascii armored output"
 msgstr "建立以 ASCII 封裝過的輸出"
 
-#: g10/gpg.c:436 sm/gpgsm.c:291
+#: g10/gpg.c:436 sm/gpgsm.c:293
 msgid "|NAME|encrypt for NAME"
 msgstr "|名字|以「名字」作為加密對象"
 
-#: g10/gpg.c:447 sm/gpgsm.c:327
+#: g10/gpg.c:447 sm/gpgsm.c:331
 msgid "use this user-id to sign or decrypt"
 msgstr "使用這個使用者 ID 來簽署或解密"
 
-#: g10/gpg.c:448 sm/gpgsm.c:330
+#: g10/gpg.c:448 sm/gpgsm.c:334
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:332
+#: g10/gpg.c:453 sm/gpgsm.c:336
 msgid "use canonical text mode"
 msgstr "使用標準的文字模式"
 
-#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "當作輸出檔案來使用"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "不要做任何改變"
 
@@ -1617,7 +1628,7 @@ msgstr "使用嚴謹的 OpenPGP 行為"
 msgid "generate PGP 2.x compatible messages"
 msgstr "產生 PGP 2.x 相容性訊息"
 
-#: g10/gpg.c:553 sm/gpgsm.c:393
+#: g10/gpg.c:553 sm/gpgsm.c:397
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1625,7 +1636,7 @@ msgstr ""
 "@\n"
 "(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:396
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1663,7 +1674,7 @@ msgstr ""
 "簽署, 檢查, 加密或解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:532
+#: g10/gpg.c:781 sm/gpgsm.c:538
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1691,7 +1702,7 @@ msgstr "壓縮: "
 msgid "usage: gpg [options] "
 msgstr "用法: gpg [選項] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:669
+#: g10/gpg.c:1045 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "指令彼此矛盾\n"
 
@@ -1767,451 +1778,451 @@ msgstr "警告: 延伸模組 `%s' 的封入目錄權限並不安全\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的組態項目 `%s'\n"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1540
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1542
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1544
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/gpg.c:1548
+#: g10/gpg.c:1546
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1550
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1552
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1554
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1556
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1558
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1560
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "在私鑰清單和公鑰清單間切換"
 
-#: g10/gpg.c:1564
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/gpg.c:1827
+#: g10/gpg.c:1825
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1983
+#: g10/gpg.c:1981
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "請注意: 舊有的預設選項檔 `%s' 已被忽略\n"
 
-#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
+#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "請注意: 一般情況下不會用到 %s!\n"
 
-#: g10/gpg.c:2401 g10/gpg.c:2413
+#: g10/gpg.c:2399 g10/gpg.c:2411
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2493
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' 不是一個有效的字元集\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4084
+#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖析金鑰伺服器 URI\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2528
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2531
 msgid "invalid keyserver options\n"
 msgstr "無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2538
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無效的匯入選項\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2541
 msgid "invalid import options\n"
 msgstr "無效的匯入選項\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2548
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無效的匯出選項\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2551
 msgid "invalid export options\n"
 msgstr "無效的匯出選項\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2558
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無效的清單選項\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2561
 msgid "invalid list options\n"
 msgstr "無效的清單選項\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2569
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2571
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2573
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2575
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2579
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2581
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2585
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2587
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2589
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2591
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2598
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2601
 msgid "invalid verify options\n"
 msgstr "無效的驗證選項\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2608
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "無法把執行檔路徑設成 %s\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2782
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:2787
+#: g10/gpg.c:2785
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2873 sm/gpgsm.c:1220
+#: g10/gpg.c:2871 sm/gpgsm.c:1247
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: 程式可能會傾印出核心檔!\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2875
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告: %s 會使得 %s 失效\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2884
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不被允許跟 %s 併用\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2887
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 跟 %s 放在一起沒有意義!\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2902
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
 
-#: g10/gpg.c:2918
+#: g10/gpg.c:2916
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "妳祇有在 --pgp2 模式下纔能做出分離式或明文簽章\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2922
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "妳在 --pgp2 模式下時, 不能同時簽署和加密\n"
 
-#: g10/gpg.c:2930
+#: g10/gpg.c:2928
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "啟用 --pgp2 時妳祇應該使用檔案, 而非管道\n"
 
-#: g10/gpg.c:2943
+#: g10/gpg.c:2941
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
 
-#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
+#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1303
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所選的編密演算法無效\n"
 
-#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
+#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1311
 msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
-#: g10/gpg.c:3021
+#: g10/gpg.c:3019
 msgid "selected compression algorithm is invalid\n"
 msgstr "所選的壓縮演算法無效\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3025
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所選的憑證摘要演算法無效\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3040
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed 一定要大於 0\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3042
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed 一定要大於 1\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3044
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3046
 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:3050
+#: g10/gpg.c:3048
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
 
-#: g10/gpg.c:3053
+#: g10/gpg.c:3051
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "請注意: 強烈不建議使用單純的 S2K 模式 (0)\n"
 
-#: g10/gpg.c:3057
+#: g10/gpg.c:3055
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3062
 msgid "invalid default preferences\n"
 msgstr "無效的預設偏好\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3071
 msgid "invalid personal cipher preferences\n"
 msgstr "無效的個人編密法偏好\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3075
 msgid "invalid personal digest preferences\n"
 msgstr "無效的個人摘要偏好\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3079
 msgid "invalid personal compress preferences\n"
 msgstr "無效的個人壓縮偏好\n"
 
-#: g10/gpg.c:3114
+#: g10/gpg.c:3112
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 還沒辦法跟 %s 一起運作\n"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3159
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "妳不該將編密演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3164
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "妳不該將摘要演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3171
+#: g10/gpg.c:3169
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "妳不該將壓縮演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3263
+#: g10/gpg.c:3261
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信任資料庫啟始失敗: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3272
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
-#: g10/gpg.c:3295
+#: g10/gpg.c:3293
 msgid "--store [filename]"
 msgstr "--store [檔名]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3300
 msgid "--symmetric [filename]"
 msgstr "--symmetric [檔名]"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3302
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' 的對稱式加密失敗: %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3312
 msgid "--encrypt [filename]"
 msgstr "--encrypt [檔名]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3325
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [檔名]"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3327
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3332
+#: g10/gpg.c:3330
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3348
 msgid "--sign [filename]"
 msgstr "--sign [檔名]"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3361
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [檔名]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3376
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [檔名]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3378
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3381
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3401
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [檔名]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3410
 msgid "--clearsign [filename]"
 msgstr "--clearsign [檔名]"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3435
 msgid "--decrypt [filename]"
 msgstr "--decrypt [檔名]"
 
-#: g10/gpg.c:3445
+#: g10/gpg.c:3443
 msgid "--sign-key user-id"
 msgstr "--sign-key 使用者ID"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3447
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 使用者ID"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3468
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 使用者ID [指令]"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3553
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "送至金鑰伺服器時失敗: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "從金鑰伺服器接收時失敗: %s\n"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3557
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "金鑰匯出時失敗: %s\n"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3568
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "從金鑰伺服器中搜尋時失敗: %s\n"
 
-#: g10/gpg.c:3580
+#: g10/gpg.c:3578
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "從金鑰伺服器更新時失敗: %s\n"
 
-#: g10/gpg.c:3631
+#: g10/gpg.c:3629
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解開封裝失敗: %s\n"
 
-#: g10/gpg.c:3639
+#: g10/gpg.c:3637
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "進行封裝失敗: %s\n"
 
-#: g10/gpg.c:3729
+#: g10/gpg.c:3727
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "無效的 `%s' 雜湊演算法\n"
 
-#: g10/gpg.c:3846
+#: g10/gpg.c:3844
 msgid "[filename]"
 msgstr "[檔名]"
 
-#: g10/gpg.c:3850
+#: g10/gpg.c:3848
 msgid "Go ahead and type your message ...\n"
 msgstr "請開始鍵入妳的訊息 ...\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4160
 msgid "the given certification policy URL is invalid\n"
 msgstr "給定的的憑證原則 URL 無效\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4162
 msgid "the given signature policy URL is invalid\n"
 msgstr "給定的簽章原則 URL 無效\n"
 
-#: g10/gpg.c:4197
+#: g10/gpg.c:4195
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
@@ -2223,7 +2234,7 @@ msgstr "從這個鑰匙圈裡取用金鑰"
 msgid "make timestamp conflicts only a warning"
 msgstr "僅把時間戳印矛盾視為警告"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:368
+#: g10/gpgv.c:75 sm/gpgsm.c:372
 msgid "|FD|write status info to this FD"
 msgstr "|檔案描述|把狀態資訊寫入此檔案描述"
 
@@ -6495,61 +6506,61 @@ msgstr "管理者個人識別碼 (PIN) 之驗證目前在此指令中被禁止�
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
 
-#: scd/scdaemon.c:105
+#: scd/scdaemon.c:108
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:357
+#: scd/scdaemon.c:114 sm/gpgsm.c:361
 #, fuzzy
 msgid "read options from file"
 msgstr "從 `%s' 讀取選項\n"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:124
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:126
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:129
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:134
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:135
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "顯示管理者指令"
 
-#: scd/scdaemon.c:206
+#: scd/scdaemon.c:209
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: scd/scdaemon.c:208
+#: scd/scdaemon.c:211
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:671
+#: scd/scdaemon.c:658
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1019
+#: scd/scdaemon.c:1006
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1024
+#: scd/scdaemon.c:1011
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6578,143 +6589,257 @@ msgstr "gpg-agent 協定版本 %d 未被支援\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:174
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr ""
+
+#: sm/certchain.c:195
+msgid "chain"
+msgstr ""
+
+#: sm/certchain.c:196
+msgid "shell"
+msgstr ""
+
+#: sm/certchain.c:241
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agent 協定版本 %d 未被支援\n"
 
-#: sm/certchain.c:212
+#: sm/certchain.c:279
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:250
+#: sm/certchain.c:317
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:260
+#: sm/certchain.c:327
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
 
-#: sm/certchain.c:267 sm/certchain.c:296
+#: sm/certchain.c:334 sm/certchain.c:363
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:271 sm/certchain.c:300
+#: sm/certchain.c:338 sm/certchain.c:367
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "未被允許匯出私鑰\n"
 
-#: sm/certchain.c:411
+#: sm/certchain.c:478
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:431
+#: sm/certchain.c:498
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "存放金鑰失敗: %s\n"
 
-#: sm/certchain.c:675
+#: sm/certchain.c:742
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "請注意: 金鑰已經被撤銷了"
 
-#: sm/certchain.c:684
+#: sm/certchain.c:752
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "損壞的憑證"
 
-#: sm/certchain.c:688
+#: sm/certchain.c:757
+msgid "the status of the certificate is unknown"
+msgstr ""
+
+#: sm/certchain.c:762
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "可用的金鑰於: "
 
-#: sm/certchain.c:690
+#: sm/certchain.c:764
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:695
+#: sm/certchain.c:770
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "檢查已建立的簽章時發生錯誤: %s\n"
 
-#: sm/certchain.c:791
-#, fuzzy
-msgid "no issuer found in certificate"
-msgstr "產生一份撤銷憑證"
-
-#: sm/certchain.c:820
+#: sm/certchain.c:799 sm/certchain.c:867
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:836
+#: sm/certchain.c:814 sm/certchain.c:899
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:849
+#: sm/certchain.c:815 sm/certchain.c:900
+#, fuzzy
+msgid "root certificate not yet valid"
+msgstr "未被允許匯出私鑰\n"
+
+#: sm/certchain.c:816 sm/certchain.c:901
+msgid "intermediate certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:829
 #, fuzzy
 msgid "certificate has expired"
 msgstr "這把金鑰已經過期了!"
 
-#: sm/certchain.c:892
-msgid "self-signed certificate has a BAD signature"
+#: sm/certchain.c:830
+#, fuzzy
+msgid "root certificate has expired"
+msgstr "這把金鑰已經過期了!"
+
+#: sm/certchain.c:831
+#, fuzzy
+msgid "intermediate certificate has expired"
+msgstr "這把金鑰已經過期了!"
+
+#: sm/certchain.c:873
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:960
-msgid "root certificate is not marked trusted"
+#: sm/certchain.c:882
+#, fuzzy
+msgid "certificate with invalid validity"
+msgstr "這把金鑰已經過期了!"
+
+#: sm/certchain.c:919
+msgid "signature not created during lifetime of certificate"
+msgstr ""
+
+#: sm/certchain.c:921
+msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:975
+#: sm/certchain.c:922
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:926
+#, fuzzy
+msgid "  (  signature created at "
+msgstr "      已被清除掉的簽章: %lu\n"
+
+#: sm/certchain.c:927
+#, fuzzy
+msgid "  (certificate created at "
+msgstr "已建立撤銷憑證.\n"
+
+#: sm/certchain.c:930
+#, fuzzy
+msgid "  (certificate valid from "
+msgstr "損壞的憑證"
+
+#: sm/certchain.c:931
+#, fuzzy
+msgid "  (     issuer valid from "
+msgstr "      卡片序號 ="
+
+#: sm/certchain.c:961
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "憑證中心 (CA) 指紋: "
 
-#: sm/certchain.c:983
+#: sm/certchain.c:970
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:998
+#: sm/certchain.c:983
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1004
+#: sm/certchain.c:989
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1046
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr ""
+
+#: sm/certchain.c:1110
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "產生一份撤銷憑證"
+
+#: sm/certchain.c:1184
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:1253
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:1266
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "檢查已建立的簽章時發生錯誤: %s\n"
 
-#: sm/certchain.c:1041 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1053
+#: sm/certchain.c:1307
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1086
+#: sm/certchain.c:1340
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "驗證某份簽章"
 
-#: sm/certchain.c:1116
+#: sm/certchain.c:1371
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1167
+#: sm/certchain.c:1422
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
+#: sm/certchain.c:1462 sm/certchain.c:1730
+#, fuzzy
+msgid "certificate is good\n"
+msgstr "偏好設定 `%s' 重複了\n"
+
+#: sm/certchain.c:1463
+#, fuzzy
+msgid "intermediate certificate is good\n"
+msgstr "已建立撤銷憑證.\n"
+
+#: sm/certchain.c:1464
+#, fuzzy
+msgid "root certificate is good\n"
+msgstr "損壞的憑證"
+
+#: sm/certchain.c:1620
+msgid "switching to chain model"
+msgstr ""
+
+#: sm/certchain.c:1629
+#, c-format
+msgid "validation model used: %s"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "chain model"
+msgstr ""
+
+#: sm/certchain.c:1631
+msgid "shell model"
+msgstr ""
+
 #: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
@@ -6762,7 +6887,7 @@ msgstr "錯誤: 無效的回應.\n"
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
 "\"%s\"\n"
-"S/N %s, ID %08lX, created %s"
+"S/N %s, ID 0x%08lX, created %s"
 msgstr ""
 "妳需要用密語來解開下列使用者的私鑰：\n"
 "\"%.*s\"\n"
@@ -6772,7 +6897,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:131 sm/keylist.c:255
+#: sm/certlist.c:131 sm/keylist.c:258
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "取得現用金鑰資訊時發生錯誤: %s\n"
@@ -6894,190 +7019,190 @@ msgstr "建立密語的時候發生錯誤: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "%s: 寫入目錄記錄時錯誤: %s\n"
 
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[檔案]|建立一份簽章"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[檔案]|建立一份明文簽章"
 
-#: sm/gpgsm.c:251
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list external keys"
 msgstr "列出私鑰"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list certificate chain"
 msgstr "損壞的憑證"
 
-#: sm/gpgsm.c:256
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "從公鑰鑰匙圈裡移去金鑰"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "import certificates"
 msgstr "損壞的憑證"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:262
 #, fuzzy
 msgid "export certificates"
 msgstr "損壞的憑證"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 #, fuzzy
 msgid "register a smartcard"
 msgstr "加入某把金鑰至智慧卡"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:268
 #, fuzzy
 msgid "change a passphrase"
 msgstr "更改密語"
 
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "建立以 ASCII 封裝過的輸出"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:287
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:296
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:297
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:302
+#: sm/gpgsm.c:304
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:305
+#: sm/gpgsm.c:309
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:312
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:315
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:319
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:323
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:325
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "已跳過: 公鑰已經被設成預設收件者\n"
 
-#: sm/gpgsm.c:338
+#: sm/gpgsm.c:342
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:346
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "檢查簽章"
 
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:347
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:352
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:353
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:354
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:356
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "從這個鑰匙圈裡取用金鑰"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:357
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "要有私鑰纔能這麼做.\n"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:359
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:360
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|名字|以「名字」作為加密對象"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:364
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:375
+#: sm/gpgsm.c:379
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:381
+#: sm/gpgsm.c:385
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "未知的編密演算法"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:387
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s 簽章, 摘要演算法 %s\n"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:389
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "未知的壓縮演算法"
 
-#: sm/gpgsm.c:522
+#: sm/gpgsm.c:528
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: sm/gpgsm.c:525
+#: sm/gpgsm.c:531
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7088,31 +7213,36 @@ msgstr ""
 "簽署, 檢查, 加密或解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: sm/gpgsm.c:604
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "用法: gpg [選項] "
 
-#: sm/gpgsm.c:685
+#: sm/gpgsm.c:691
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "無法連接至 `%s': %s\n"
 
-#: sm/gpgsm.c:1237
+#: sm/gpgsm.c:713
+#, fuzzy, c-format
+msgid "unknown validation model `%s'\n"
+msgstr "未知的選項 `%s'\n"
+
+#: sm/gpgsm.c:1264
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1316
+#: sm/gpgsm.c:1344
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1334
+#: sm/gpgsm.c:1362
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "無法存取 `%s': %s\n"
 
-#: sm/gpgsm.c:1529
+#: sm/gpgsm.c:1543
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7135,7 +7265,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:375
+#: sm/import.c:541 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
@@ -7219,7 +7349,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234
+#: sm/qualified.c:234 sm/verify.c:536
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7238,30 +7368,35 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "檢查已建立的簽章時發生錯誤: %s\n"
 
-#: sm/verify.c:386
+#: sm/verify.c:388
 #, fuzzy
 msgid "Signature made "
 msgstr "由 %s 建立的簽章\n"
 
-#: sm/verify.c:390
+#: sm/verify.c:392
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:391
-#, c-format
-msgid " using certificate ID %08lX\n"
-msgstr ""
+#: sm/verify.c:393
+#, fuzzy, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr "取得現用金鑰資訊時發生錯誤: %s\n"
 
-#: sm/verify.c:507
+#: sm/verify.c:514
 #, fuzzy
 msgid "Good signature from"
 msgstr "完好的簽章來自於 \"%s\""
 
-#: sm/verify.c:508
+#: sm/verify.c:515
 #, fuzzy
 msgid "                aka"
 msgstr "                亦即 \"%s\""
 
+#: sm/verify.c:533
+#, fuzzy
+msgid "This is a qualified signature\n"
+msgstr "這將會是一份自我簽章.\n"
+
 #: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
@@ -7298,131 +7433,136 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:315
+#: tools/gpg-connect-agent.c:314
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:323
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:382
+#: tools/gpg-connect-agent.c:381
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "列太長"
 
-#: tools/gpg-connect-agent.c:386
+#: tools/gpg-connect-agent.c:385
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:458
+#: tools/gpg-connect-agent.c:457
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "未知的選項 `%s'\n"
 
-#: tools/gpg-connect-agent.c:466
+#: tools/gpg-connect-agent.c:465
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "簽署時失敗了: %s\n"
 
-#: tools/gpg-connect-agent.c:474
+#: tools/gpg-connect-agent.c:473
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "讀取公鑰時失敗: %s\n"
 
-#: tools/gpg-connect-agent.c:784
+#: tools/gpg-connect-agent.c:789
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: tools/gpg-connect-agent.c:793
+#: tools/gpg-connect-agent.c:798
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
+#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
-#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
+#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
-#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:501
+#: tools/gpgconf-comp.c:492
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:505
+#: tools/gpgconf-comp.c:496
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:509
+#: tools/gpgconf-comp.c:500
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:510
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:638
+#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#, fuzzy
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|名字|以「名字」作為加密對象"
+
+#: tools/gpgconf-comp.c:635
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:640
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:685
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:705
+#: tools/gpgconf-comp.c:708
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:749
+#: tools/gpgconf-comp.c:752
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:785
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:806
+#: tools/gpgconf-comp.c:809
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:814
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:848
+#: tools/gpgconf-comp.c:851
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2681
+#: tools/gpgconf-comp.c:2684
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/scd/ChangeLog b/scd/ChangeLog
index 5bbfc2f59..33c0e4ae6 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-07  Werner Koch  <wk@g10code.com>
+
+	* tlv.c, tlv.h:  Move to ../common/.
+
 2007-08-02  Werner Koch  <wk@g10code.com>
 
 	* scdaemon.c: Include gc-opt-flags.h and remove their definition
diff --git a/scd/Makefile.am b/scd/Makefile.am
index abce5dc70..e9da5b492 100644
--- a/scd/Makefile.am
+++ b/scd/Makefile.am
@@ -38,7 +38,6 @@ scdaemon_SOURCES = \
 	apdu.c apdu.h \
 	ccid-driver.c ccid-driver.h \
 	iso7816.c iso7816.h \
-	tlv.c tlv.h \
 	app.c app-common.h app-help.c $(card_apps)
 
 
@@ -55,7 +54,6 @@ scdaemon_LDADD = $(libcommonpth) ../jnlib/libjnlib.a ../gl/libgnu.a \
 #	apdu.c apdu.h \
 #	ccid-driver.c ccid-driver.h \
 #	iso7816.c iso7816.h \
-#	tlv.c tlv.h \
 #	atr.c atr.h \
 #	app.c app-common.h app-help.c $(card_apps)
 #
diff --git a/sm/ChangeLog b/sm/ChangeLog
index 910056a74..5e51dae7a 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,65 @@
+2007-08-09  Werner Koch  <wk@g10code.com>
+
+	* gpgsm.c (main) [W32]: Enable CRL check by default.
+	(main): Update the default control structure after reading the
+	options.
+	(gpgsm_parse_validation_model, parse_validation_model): New.
+	(main): New option --validation-model.
+	* certchain.c (gpgsm_validate_chain): Implement this option.
+	* server.c (option_handler): Ditto.
+
+	* certchain.c (is_cert_still_valid): Reformatted.  Add arg
+	FORCE_OCSP.  Changed callers to set this flag when using the chain
+	model.
+
+2007-08-08  Werner Koch  <wk@g10code.com>
+
+	* certdump.c (gpgsm_print_serial): Fixed brown paper bag style bugs
+	which prefixed the output with a 3A and cut it off at a 00.
+
+	* keylist.c (list_cert_raw): Print the certificate ID first and
+	rename "Serial number" to "S/N".
+	(list_cert_std): Ditto.
+
+2007-08-07  Werner Koch  <wk@g10code.com>
+
+	* gpgsm.c (main): Allow a string for --faked-system-time.
+
+2007-08-06  Werner Koch  <wk@g10code.com>
+
+	Implementation of the chain model.
+	
+	* gpgsm.h (struct rootca_flags_s): Define new members VALID and
+	CHAIN_MODEL.
+	* call-agent.c (gpgsm_agent_istrusted): Mark ROOTCA_FLAGS valid.
+	(istrusted_status_cb): Set CHAIN_MODEL.
+	* certchain.c (gpgsm_validate_chain): Replace LM alias by LISTMODE
+	and FP by LISTFP.
+	(gpgsm_validate_chain): Factor some code out to ...
+	(check_validity_period, ask_marktrusted): .. new.
+	(check_validity_cm_basic, check_validity_cm_main): New.
+	(do_validate_chain): New with all code from gpgsm_validate_chain.
+	New arg ROOTCA_FLAGS.
+	(gpgsm_validate_chain): Provide ROOTCA_FLAGS and fallback to chain
+	model.  Add RETFLAGS arg and changed all callers to pass NULL. Add
+	CHECKTIME arg and changed all callers to pass a nil value.
+	(has_validity_model_chain): New.
+	* verify.c (gpgsm_verify): Check for chain model and return as
+	part of the trust status.
+
+	* gpgsm.h (VALIDATE_FLAG_NO_DIRMNGR): New.
+	(VALIDATE_FLAG_NO_DIRMNGR): New.
+	* call-dirmngr.c (gpgsm_dirmngr_isvalid): Use constant here.
+
+2007-08-03  Werner Koch  <wk@g10code.com>
+
+	* keylist.c (list_cert_colon): Avoid duplicate listing of kludge
+	uids.
+
+	* verify.c (gpgsm_verify): Make STATUS_VERIFY return the hash and
+	pk algo.
+	* certcheck.c (gpgsm_check_cms_signature): Add arg R_PKALGO.
+
 2007-08-02  Werner Koch  <wk@g10code.com>
 
 	* gpgsm.c (main): Factored GC_OPT_FLAGS out to gc-opt-flags.h.
diff --git a/sm/call-agent.c b/sm/call-agent.c
index da952dc09..88447bd63 100644
--- a/sm/call-agent.c
+++ b/sm/call-agent.c
@@ -486,6 +486,8 @@ istrusted_status_cb (void *opaque, const char *line)
         ;
       if (!strncmp (line, "relax", 5) && (line[5] == ' ' || !line[5]))
         flags->relax = 1;
+      else if (!strncmp (line, "cm", 2) && (line[2] == ' ' || !line[2]))
+        flags->chain_model = 1;
     }
   return 0;
 }
@@ -521,6 +523,8 @@ gpgsm_agent_istrusted (ctrl_t ctrl, ksba_cert_t cert,
 
   rc = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL,
                         istrusted_status_cb, rootca_flags);
+  if (!rc)
+    rootca_flags->valid = 1;
   return rc;
 }
 
diff --git a/sm/call-dirmngr.c b/sm/call-dirmngr.c
index 9273ffb21..3beb57799 100644
--- a/sm/call-dirmngr.c
+++ b/sm/call-dirmngr.c
@@ -394,8 +394,10 @@ isvalid_status_cb (void *opaque, const char *line)
   GPG_ERR_NO_CRL_KNOWN
   GPG_ERR_CRL_TOO_OLD
 
-  With USE_OCSP set to true, the dirmngr is asked to do an OCSP
-  request first.
+  Values for USE_OCSP:
+     0 = Do CRL check.
+     1 = Do an OCSP check.
+     2 = Do an OCSP check using only the default responder.
  */
 int
 gpgsm_dirmngr_isvalid (ctrl_t ctrl,
@@ -445,7 +447,8 @@ gpgsm_dirmngr_isvalid (ctrl_t ctrl,
 
   /* FIXME: If --disable-crl-checks has been set, we should pass an
      option to dirmngr, so that no fallback CRL check is done after an
-     ocsp check. */
+     ocsp check.  It is not a problem right now as dirmngr does not
+     fallback to CRL checking.  */
 
   /* It is sufficient to send the options only once because we have
      one connection per process only. */
@@ -456,7 +459,9 @@ gpgsm_dirmngr_isvalid (ctrl_t ctrl,
                          NULL, NULL, NULL, NULL, NULL, NULL);
       did_options = 1;
     }
-  snprintf (line, DIM(line)-1, "ISVALID %s", certid);
+  snprintf (line, DIM(line)-1, "ISVALID%s %s", 
+            use_ocsp == 2? " --only-ocsp --force-default-responder":"",
+            certid);
   line[DIM(line)-1] = 0;
   xfree (certid);
 
@@ -504,9 +509,10 @@ gpgsm_dirmngr_isvalid (ctrl_t ctrl,
                 rc = gpg_error (GPG_ERR_INV_CRL);
               else
                 {
-                  /* Note, the flag = 1: This avoids checking this
-                     certificate over and over again. */
-                  rc = gpgsm_validate_chain (ctrl, rspcert, NULL, 0, NULL, 1);
+                  /* Note the no_dirmngr flag: This avoids checking
+                     this certificate over and over again. */
+                  rc = gpgsm_validate_chain (ctrl, rspcert, "", NULL, 0, NULL, 
+                                             VALIDATE_FLAG_NO_DIRMNGR, NULL);
                   if (rc)
                     {
                       log_error ("invalid certificate used for CRL/OCSP: %s\n",
diff --git a/sm/certchain.c b/sm/certchain.c
index 7ce7e6889..fc6e28de7 100644
--- a/sm/certchain.c
+++ b/sm/certchain.c
@@ -1,6 +1,6 @@
 /* certchain.c - certificate chain validation
  * Copyright (C) 2001, 2002, 2003, 2004, 2005,
- *               2006 Free Software Foundation, Inc.
+ *               2006, 2007 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -37,6 +37,7 @@
 #include "keydb.h"
 #include "../kbx/keybox.h" /* for KEYBOX_FLAG_* */
 #include "i18n.h"
+#include "tlv.h"
 
 
 /* Object to keep track of certain root certificates. */
@@ -141,6 +142,71 @@ compare_certs (ksba_cert_t a, ksba_cert_t b)
 }
 
 
+/* Return true if CERT has the validityModel extensions and defines
+   the use of the chain model.  */
+static int
+has_validation_model_chain (ksba_cert_t cert, int listmode, estream_t listfp)
+{
+  gpg_error_t err;
+  int idx, yes;
+  const char *oid;
+  size_t off, derlen, objlen, hdrlen;
+  const unsigned char *der;
+  int class, tag, constructed, ndef;
+  char *oidbuf;
+
+  for (idx=0; !(err=ksba_cert_get_extension (cert, idx,
+                                             &oid, NULL, &off, &derlen));idx++)
+    if (!strcmp (oid, "1.3.6.1.4.1.8301.3.5") )
+      break;
+  if (err)
+    return 0; /* Not found.  */
+  der = ksba_cert_get_image (cert, NULL);
+  if (!der)
+    {
+      err = gpg_error (GPG_ERR_INV_OBJ); /* Oops  */
+      goto leave;
+    }
+  der += off;
+
+  err = parse_ber_header (&der, &derlen, &class, &tag, &constructed,
+                          &ndef, &objlen, &hdrlen);
+  if (!err && (objlen > derlen || tag != TAG_SEQUENCE))
+    err = gpg_error (GPG_ERR_INV_OBJ);
+  if (err)
+    goto leave;
+  derlen = objlen;
+  err = parse_ber_header (&der, &derlen, &class, &tag, &constructed,
+                          &ndef, &objlen, &hdrlen);
+  if (!err && (objlen > derlen || tag != TAG_OBJECT_ID))
+    err = gpg_error (GPG_ERR_INV_OBJ);
+  if (err)
+    goto leave;
+  oidbuf = ksba_oid_to_str (der, objlen);
+  if (!oidbuf)
+    {
+      err = gpg_error_from_syserror ();
+      goto leave;
+    }
+
+  if (opt.verbose)
+    do_list (0, listmode, listfp,
+             _("validation model requested by certificate: %s"), 
+              !strcmp (oidbuf, "1.3.6.1.4.1.8301.3.5.1")? _("chain") :
+              !strcmp (oidbuf, "1.3.6.1.4.1.8301.3.5.2")? _("shell") :
+              /* */                                       oidbuf);
+  yes = !strcmp (oidbuf, "1.3.6.1.4.1.8301.3.5.1");
+  ksba_free (oidbuf);
+  return yes;
+
+
+ leave:
+  log_error ("error parsing validityModel: %s\n", gpg_strerror (err));
+  return 0;
+}
+
+
+
 static int
 unknown_criticals (ksba_cert_t cert, int listmode, estream_t fp)
 {
@@ -155,6 +221,7 @@ unknown_criticals (ksba_cert_t cert, int listmode, estream_t fp)
     "2.5.29.19", /* basic Constraints */
     "2.5.29.32", /* certificatePolicies */
     "2.5.29.37", /* extendedKeyUsage - handled by certlist.c */
+    "1.3.6.1.4.1.8301.3.5", /* validityModel - handled here. */
     NULL
   };
   int rc = 0, i, idx, crit;
@@ -653,73 +720,310 @@ gpgsm_is_root_cert (ksba_cert_t cert)
 
 /* This is a helper for gpgsm_validate_chain. */
 static gpg_error_t 
-is_cert_still_valid (ctrl_t ctrl, int lm, estream_t fp,
+is_cert_still_valid (ctrl_t ctrl, int force_ocsp, int lm, estream_t fp,
                      ksba_cert_t subject_cert, ksba_cert_t issuer_cert,
                      int *any_revoked, int *any_no_crl, int *any_crl_too_old)
 {
-  if (!opt.no_crl_check || ctrl->use_ocsp)
-    {
-      gpg_error_t err;
+  gpg_error_t err;
 
-      err = gpgsm_dirmngr_isvalid (ctrl,
-                                   subject_cert, issuer_cert, ctrl->use_ocsp);
-      if (err)
+  if (opt.no_crl_check && !ctrl->use_ocsp)
+    return 0;
+
+  err = gpgsm_dirmngr_isvalid (ctrl,
+                               subject_cert, issuer_cert, 
+                               force_ocsp? 2 : !!ctrl->use_ocsp);
+  if (err)
+    {
+      if (!lm)
+        gpgsm_cert_log_name (NULL, subject_cert);
+      switch (gpg_err_code (err))
         {
-          /* Fixme: We should change the wording because we may
-             have used OCSP. */
+        case GPG_ERR_CERT_REVOKED:
+          do_list (1, lm, fp, _("certificate has been revoked"));
+          *any_revoked = 1;
+          /* Store that in the keybox so that key listings are able to
+             return the revoked flag.  We don't care about error,
+             though. */
+          keydb_set_cert_flags (subject_cert, 1, KEYBOX_FLAG_VALIDITY, 0,
+                                ~0, VALIDITY_REVOKED);
+          break;
+
+        case GPG_ERR_NO_CRL_KNOWN:
+          do_list (1, lm, fp, _("no CRL found for certificate"));
+          *any_no_crl = 1;
+          break;
+
+        case GPG_ERR_NO_DATA:
+          do_list (1, lm, fp, _("the status of the certificate is unknown"));
+          *any_no_crl = 1;
+          break;
+
+        case GPG_ERR_CRL_TOO_OLD:
+          do_list (1, lm, fp, _("the available CRL is too old"));
           if (!lm)
-            gpgsm_cert_log_name (NULL, subject_cert);
-          switch (gpg_err_code (err))
-            {
-            case GPG_ERR_CERT_REVOKED:
-              do_list (1, lm, fp, _("certificate has been revoked"));
-              *any_revoked = 1;
-              /* Store that in the keybox so that key listings are
-                 able to return the revoked flag.  We don't care
-                 about error, though. */
-              keydb_set_cert_flags (subject_cert, 1, KEYBOX_FLAG_VALIDITY, 0,
-                                    ~0, VALIDITY_REVOKED);
-              break;
-            case GPG_ERR_NO_CRL_KNOWN:
-              do_list (1, lm, fp, _("no CRL found for certificate"));
-              *any_no_crl = 1;
-              break;
-            case GPG_ERR_CRL_TOO_OLD:
-              do_list (1, lm, fp, _("the available CRL is too old"));
-              if (!lm)
-                log_info (_("please make sure that the "
-                            "\"dirmngr\" is properly installed\n"));
-              *any_crl_too_old = 1;
-              break;
-            default:
-              do_list (1, lm, fp, _("checking the CRL failed: %s"),
-                       gpg_strerror (err));
-              return err;
-            }
+            log_info (_("please make sure that the "
+                        "\"dirmngr\" is properly installed\n"));
+          *any_crl_too_old = 1;
+          break;
+          
+        default:
+          do_list (1, lm, fp, _("checking the CRL failed: %s"),
+                   gpg_strerror (err));
+          return err;
         }
     }
   return 0;
 }
 
 
+/* Helper for gpgsm_validate_chain to check the validity period of
+   SUBJECT_CERT.  The caller needs to pass EXPTIME which will be
+   updated to the nearest expiration time seen.  A DEPTH of 0 indicates
+   the target certifciate, -1 the final root certificate and other
+   values intermediate certificates. */ 
+static gpg_error_t
+check_validity_period (ksba_isotime_t current_time,
+                       ksba_cert_t subject_cert,
+                       ksba_isotime_t exptime,
+                       int listmode, estream_t listfp, int depth)
+{
+  gpg_error_t err;
+  ksba_isotime_t not_before, not_after;
+
+  err = ksba_cert_get_validity (subject_cert, 0, not_before);
+  if (!err)
+    err = ksba_cert_get_validity (subject_cert, 1, not_after);
+  if (err)
+    {
+      do_list (1, listmode, listfp,
+               _("certificate with invalid validity: %s"), gpg_strerror (err));
+      return gpg_error (GPG_ERR_BAD_CERT);
+    }
+
+  if (*not_after)
+    {
+      if (!*exptime)
+        gnupg_copy_time (exptime, not_after);
+      else if (strcmp (not_after, exptime) < 0 )
+        gnupg_copy_time (exptime, not_after);
+    }
+
+  if (*not_before && strcmp (current_time, not_before) < 0 )
+    {
+      do_list (1, listmode, listfp, 
+               depth ==  0 ? _("certificate not yet valid") :
+               depth == -1 ? _("root certificate not yet valid") :
+               /* other */   _("intermediate certificate not yet valid"));
+      if (!listmode)
+        {
+          log_info ("  (valid from ");
+          gpgsm_dump_time (not_before);
+          log_printf (")\n");
+        }
+      return gpg_error (GPG_ERR_CERT_TOO_YOUNG);
+    } 
+           
+  if (*not_after && strcmp (current_time, not_after) > 0 )
+    {
+      do_list (opt.ignore_expiration?0:1, listmode, listfp,
+               depth == 0  ? _("certificate has expired") :
+               depth == -1 ? _("root certificate has expired") :
+               /* other  */  _("intermediate certificate has expired"));
+      if (!listmode)
+        {
+          log_info ("  (expired at ");
+          gpgsm_dump_time (not_after);
+          log_printf (")\n");
+        }
+      if (opt.ignore_expiration)
+        log_info ("WARNING: ignoring expiration\n");
+      else
+        return gpg_error (GPG_ERR_CERT_EXPIRED);
+    }      
+      
+  return 0;
+}
+
+/* This is a variant of check_validity_period used with the chain
+   model.  The dextra contraint here is that notBefore and notAfter
+   must exists and if the additional argument CHECK_TIME is given this
+   time is used to check the validity period of SUBJECT_CERT.  */
+static gpg_error_t
+check_validity_period_cm (ksba_isotime_t current_time,
+                          ksba_isotime_t check_time,
+                          ksba_cert_t subject_cert,
+                          ksba_isotime_t exptime,
+                          int listmode, estream_t listfp, int depth)
+{
+  gpg_error_t err;
+  ksba_isotime_t not_before, not_after;
+
+  err = ksba_cert_get_validity (subject_cert, 0, not_before);
+  if (!err)
+    err = ksba_cert_get_validity (subject_cert, 1, not_after);
+  if (err)
+    {
+      do_list (1, listmode, listfp,
+               _("certificate with invalid validity: %s"), gpg_strerror (err));
+      return gpg_error (GPG_ERR_BAD_CERT);
+    }
+  if (!*not_before || !*not_after)
+    {
+      do_list (1, listmode, listfp,
+               _("required certificate attributes missing: %s%s%s"),
+               !*not_before? "notBefore":"",
+               (!*not_before && !*not_after)? ", ":"",
+               !*not_before? "notAfter":"");
+      return gpg_error (GPG_ERR_BAD_CERT);
+    }
+  if (strcmp (not_before, not_after) > 0 )
+    {
+      do_list (1, listmode, listfp,
+               _("certificate with invalid validity"));
+      log_info ("  (valid from ");
+      gpgsm_dump_time (not_before);
+      log_printf (" expired at ");
+      gpgsm_dump_time (not_after);
+      log_printf (")\n");
+      return gpg_error (GPG_ERR_BAD_CERT);
+    }
+  
+  if (!*exptime)
+    gnupg_copy_time (exptime, not_after);
+  else if (strcmp (not_after, exptime) < 0 )
+    gnupg_copy_time (exptime, not_after);
+
+  if (strcmp (current_time, not_before) < 0 )
+    {
+      do_list (1, listmode, listfp, 
+               depth ==  0 ? _("certificate not yet valid") :
+               depth == -1 ? _("root certificate not yet valid") :
+               /* other */   _("intermediate certificate not yet valid"));
+      if (!listmode)
+        {
+          log_info ("  (valid from ");
+          gpgsm_dump_time (not_before);
+          log_printf (")\n");
+        }
+      return gpg_error (GPG_ERR_CERT_TOO_YOUNG);
+    } 
+
+  if (*check_time
+      && (strcmp (check_time, not_before) < 0 
+          || strcmp (check_time, not_after) > 0))
+    {
+      /* Note that we don't need a case for the root certificate
+         because its own consitency has already been checked.  */
+      do_list(opt.ignore_expiration?0:1, listmode, listfp,
+              depth == 0 ? 
+              _("signature not created during lifetime of certificate") :
+              depth == 1 ?
+              _("certificate not created during lifetime of issuer") :
+              _("intermediate certificate not created during lifetime "
+                "of issuer"));
+      if (!listmode)
+        {
+          log_info (depth== 0? _("  (  signature created at ") :
+                    /* */      _("  (certificate created at ") );
+          gpgsm_dump_time (check_time);
+          log_printf (")\n");
+          log_info (depth==0? _("  (certificate valid from ") :
+                    /* */     _("  (     issuer valid from ") );
+          gpgsm_dump_time (not_before);
+          log_info (" to ");
+          gpgsm_dump_time (not_after);
+          log_printf (")\n");
+        }
+      if (opt.ignore_expiration)
+        log_info ("WARNING: ignoring expiration\n");
+      else
+        return gpg_error (GPG_ERR_CERT_EXPIRED);
+    }
+
+  return 0;
+}
+
+
+
+/* Ask the user whether he wants to mark the certificate CERT trusted.
+   Returns true if the CERT is the trusted.  We also check whether the
+   agent is at all enabled to allow marktrusted and don't call it in
+   this session again if it is not.  */
+static int
+ask_marktrusted (ctrl_t ctrl, ksba_cert_t cert, int listmode)
+{
+  static int no_more_questions; 
+  int rc;
+  char *fpr;
+  int success = 0;
+
+  fpr = gpgsm_get_fingerprint_string (cert, GCRY_MD_SHA1);
+  log_info (_("fingerprint=%s\n"), fpr? fpr : "?");
+  xfree (fpr);
+  
+  if (no_more_questions)
+    rc = gpg_error (GPG_ERR_NOT_SUPPORTED);
+  else
+    rc = gpgsm_agent_marktrusted (ctrl, cert);
+  if (!rc)
+    {
+      log_info (_("root certificate has now been marked as trusted\n"));
+      success = 1;
+    }
+  else if (!listmode)
+    {
+      gpgsm_dump_cert ("issuer", cert);
+      log_info ("after checking the fingerprint, you may want "
+                "to add it manually to the list of trusted certificates.\n");
+    }
+
+  if (gpg_err_code (rc) == GPG_ERR_NOT_SUPPORTED)
+    {
+      if (!no_more_questions)
+        log_info (_("interactive marking as trusted "
+                    "not enabled in gpg-agent\n"));
+      no_more_questions = 1;
+    }
+  else if (gpg_err_code (rc) == GPG_ERR_CANCELED)
+    {
+      log_info (_("interactive marking as trusted "
+                  "disabled for this session\n"));
+      no_more_questions = 1;
+    }
+  else
+    set_already_asked_marktrusted (cert);
+
+  return success;
+}
+
+
+
 
 /* Validate a chain and optionally return the nearest expiration time
    in R_EXPTIME. With LISTMODE set to 1 a special listmode is
    activated where only information about the certificate is printed
-   to FP and no output is send to the usual log stream. 
+   to LISTFP and no output is send to the usual log stream.  If
+   CHECKTIME_ARG is set, it is used only in the chain model instead of the
+   current time.
+
+   Defined flag bits
 
-   Defined flag bits: 0 - do not do any dirmngr isvalid checks.
+   VALIDATE_FLAG_NO_DIRMNGR  - Do not do any dirmngr isvalid checks.
+   VALIDATE_FLAG_CHAIN_MODEL - Check according to chain model.
 */
-int
-gpgsm_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t r_exptime,
-                      int listmode, estream_t fp, unsigned int flags)
+static int
+do_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t checktime_arg,
+                   ksba_isotime_t r_exptime,
+                   int listmode, estream_t listfp, unsigned int flags,
+                   struct rootca_flags_s *rootca_flags)
 {
-  int rc = 0, depth = 0, maxdepth;
+  int rc = 0, depth, maxdepth;
   char *issuer = NULL;
   char *subject = NULL;
   KEYDB_HANDLE kh = NULL;
   ksba_cert_t subject_cert = NULL, issuer_cert = NULL;
   ksba_isotime_t current_time;
+  ksba_isotime_t check_time;
   ksba_isotime_t exptime;
   int any_expired = 0;
   int any_revoked = 0;
@@ -729,11 +1033,26 @@ gpgsm_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t r_exptime,
   int is_qualified = -1; /* Indicates whether the certificate stems
                             from a qualified root certificate.
                             -1 = unknown, 0 = no, 1 = yes. */
-  int lm = listmode;
   chain_item_t chain = NULL; /* A list of all certificates in the chain.  */
 
 
   gnupg_get_isotime (current_time);
+
+  if ( (flags & VALIDATE_FLAG_CHAIN_MODEL) )
+    {
+      if (!strcmp (checktime_arg, "19700101T000000"))
+        {
+          do_list (1, listmode, listfp, 
+                   _("WARNING: creation time of signature not known - "
+                     "assuming current time"));
+          gnupg_copy_time (check_time, current_time);
+        }
+      else
+        gnupg_copy_time (check_time, checktime_arg);
+    }
+  else
+    *check_time = 0;
+
   if (r_exptime)
     *r_exptime = 0;
   *exptime = 0;
@@ -758,12 +1077,12 @@ gpgsm_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t r_exptime,
   subject_cert = cert;
   ksba_cert_ref (subject_cert);
   maxdepth = 50;
+  depth = 0;
 
   for (;;)
     {
       int is_root;
       gpg_error_t istrusted_rc = -1;
-      struct rootca_flags_s rootca_flags;
 
       /* Put the certificate on our list.  */
       {
@@ -788,13 +1107,16 @@ gpgsm_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t r_exptime,
 
       if (!issuer)
         {
-          do_list (1, lm, fp,  _("no issuer found in certificate"));
+          do_list (1, listmode, listfp,  _("no issuer found in certificate"));
           rc = gpg_error (GPG_ERR_BAD_CERT);
           goto leave;
         }
 
 
-      /* Is this a self-issued certificate (i.e. the root certificate)? */
+      /* Is this a self-issued certificate (i.e. the root
+         certificate)?  This is actually the same test as done by
+         gpgsm_is_root_cert but here we want to keep the issuer and
+         subject for later use.  */
       is_root = (subject && !strcmp (issuer, subject));
       if (is_root)
         {
@@ -804,71 +1126,41 @@ gpgsm_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t r_exptime,
              check right here so that we can access special flags
              associated with that specific root certificate.  */
           istrusted_rc = gpgsm_agent_istrusted (ctrl, subject_cert,
-                                                &rootca_flags);
+                                                rootca_flags);
+          /* If the chain model extended attribute is used, make sure
+             that our chain model flag is set. */
+          if (has_validation_model_chain (subject_cert, listmode, listfp))
+            rootca_flags->chain_model = 1;
         }
       
 
       /* Check the validity period. */
-      {
-        ksba_isotime_t not_before, not_after;
-
-        rc = ksba_cert_get_validity (subject_cert, 0, not_before);
-        if (!rc)
-          rc = ksba_cert_get_validity (subject_cert, 1, not_after);
-        if (rc)
-          {
-            do_list (1, lm, fp, _("certificate with invalid validity: %s"),
-                     gpg_strerror (rc));
-            rc = gpg_error (GPG_ERR_BAD_CERT);
-            goto leave;
-          }
-
-        if (*not_after)
-          {
-            if (!*exptime)
-              gnupg_copy_time (exptime, not_after);
-            else if (strcmp (not_after, exptime) < 0 )
-              gnupg_copy_time (exptime, not_after);
-          }
-
-        if (*not_before && strcmp (current_time, not_before) < 0 )
-          {
-            do_list (1, lm, fp, _("certificate not yet valid"));
-            if (!lm)
-              {
-                log_info ("(valid from ");
-                gpgsm_dump_time (not_before);
-                log_printf (")\n");
-              }
-            rc = gpg_error (GPG_ERR_CERT_TOO_YOUNG);
-            goto leave;
-          }            
-        if (*not_after && strcmp (current_time, not_after) > 0 )
-          {
-            do_list (opt.ignore_expiration?0:1, lm, fp,
-                     _("certificate has expired"));
-            if (!lm)
-              {
-                log_info ("(expired at ");
-                gpgsm_dump_time (not_after);
-                log_printf (")\n");
-              }
-            if (opt.ignore_expiration)
-                log_info ("WARNING: ignoring expiration\n");
-            else
-              any_expired = 1;
-          }            
-      }
+      if ( (flags & VALIDATE_FLAG_CHAIN_MODEL) )
+        rc = check_validity_period_cm (current_time, check_time, subject_cert,
+                                       exptime, listmode, listfp,
+                                       (depth && is_root)? -1: depth);
+      else
+        rc = check_validity_period (current_time, subject_cert,
+                                    exptime, listmode, listfp,
+                                    (depth && is_root)? -1: depth);
+      if (gpg_err_code (rc) == GPG_ERR_CERT_EXPIRED)
+        {
+          any_expired = 1;
+          rc = 0;
+        }
+      else if (rc)
+        goto leave;
+        
 
       /* Assert that we understand all critical extensions. */
-      rc = unknown_criticals (subject_cert, listmode, fp);
+      rc = unknown_criticals (subject_cert, listmode, listfp);
       if (rc)
         goto leave;
 
       /* Do a policy check. */
       if (!opt.no_policy_check)
         {
-          rc = check_cert_policy (subject_cert, listmode, fp);
+          rc = check_cert_policy (subject_cert, listmode, listfp);
           if (gpg_err_code (rc) == GPG_ERR_NO_POLICY_MATCH)
             {
               any_no_policy_match = 1;
@@ -879,7 +1171,7 @@ gpgsm_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t r_exptime,
         }
 
 
-      /* Is this a self-issued certificate? */
+      /* If this is the root certificate we are at the end of the chain.  */
       if (is_root)
         { 
           if (!istrusted_rc)
@@ -888,7 +1180,7 @@ gpgsm_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t r_exptime,
             {
               /* We only check the signature if the certificate is not
                  trusted for better diagnostics. */
-              do_list (1, lm, fp,
+              do_list (1, listmode, listfp,
                        _("self-signed certificate has a BAD signature"));
               if (DBG_X509)
                 {
@@ -898,9 +1190,9 @@ gpgsm_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t r_exptime,
                                    : GPG_ERR_BAD_CERT);
               goto leave;
             }
-          if (!rootca_flags.relax)
+          if (!rootca_flags->relax)
             {
-              rc = allowed_ca (subject_cert, NULL, listmode, fp);
+              rc = allowed_ca (subject_cert, NULL, listmode, listfp);
               if (rc)
                 goto leave;
             }
@@ -957,57 +1249,17 @@ gpgsm_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t r_exptime,
             ;
           else if (gpg_err_code (rc) == GPG_ERR_NOT_TRUSTED)
             {
-              do_list (0, lm, fp, _("root certificate is not marked trusted"));
+              do_list (0, listmode, listfp, 
+                       _("root certificate is not marked trusted"));
               /* If we already figured out that the certificate is
                  expired it does not make much sense to ask the user
-                 whether we wants to trust the root certificate.  He
+                 whether we wants to trust the root certificate.  We
                  should do this only if the certificate under question
-                 will then be usable.  We also check whether the agent
-                 is at all enabled to allo marktrusted and don't call
-                 it in this session again if it is not. */
+                 will then be usable.  */
               if ( !any_expired
-                   && (!lm || !already_asked_marktrusted (subject_cert)))
-                {
-                  static int no_more_questions; /* during this session. */
-                  int rc2;
-                  char *fpr = gpgsm_get_fingerprint_string (subject_cert,
-                                                            GCRY_MD_SHA1);
-                  log_info (_("fingerprint=%s\n"), fpr? fpr : "?");
-                  xfree (fpr);
-                  if (no_more_questions)
-                    rc2 = gpg_error (GPG_ERR_NOT_SUPPORTED);
-                  else
-                    rc2 = gpgsm_agent_marktrusted (ctrl, subject_cert);
-                  if (!rc2)
-                    {
-                      log_info (_("root certificate has now"
-                                  " been marked as trusted\n"));
-                      rc = 0;
-                    }
-                  else if (!lm)
-                    {
-                      gpgsm_dump_cert ("issuer", subject_cert);
-                      log_info ("after checking the fingerprint, you may want "
-                                "to add it manually to the list of trusted "
-                                "certificates.\n");
-                    }
-
-                  if (gpg_err_code (rc2) == GPG_ERR_NOT_SUPPORTED)
-                    {
-                      if (!no_more_questions)
-                        log_info (_("interactive marking as trusted "
-                                    "not enabled in gpg-agent\n"));
-                      no_more_questions = 1;
-                    }
-                  else if (gpg_err_code (rc2) == GPG_ERR_CANCELED)
-                    {
-                      log_info (_("interactive marking as trusted "
-                                  "disabled for this session\n"));
-                      no_more_questions = 1;
-                    }
-                  else
-                    set_already_asked_marktrusted (subject_cert);
-                }
+                   && (!listmode || !already_asked_marktrusted (subject_cert))
+                   && ask_marktrusted (ctrl, subject_cert, listmode) )
+                rc = 0;
             }
           else 
             {
@@ -1019,12 +1271,14 @@ gpgsm_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t r_exptime,
             goto leave;
 
           /* Check for revocations etc. */
-          if ((flags & 1))
+          if ((flags & VALIDATE_FLAG_NO_DIRMNGR))
             ;
-          else if (opt.no_trusted_cert_crl_check || rootca_flags.relax)
+          else if (opt.no_trusted_cert_crl_check || rootca_flags->relax)
             ; 
           else
-            rc = is_cert_still_valid (ctrl, lm, fp,
+            rc = is_cert_still_valid (ctrl, 
+                                      (flags & VALIDATE_FLAG_CHAIN_MODEL),
+                                      listmode, listfp,
                                       subject_cert, subject_cert,
                                       &any_revoked, &any_no_crl,
                                       &any_crl_too_old);
@@ -1032,13 +1286,13 @@ gpgsm_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t r_exptime,
             goto leave;
 
           break;  /* Okay: a self-signed certicate is an end-point. */
-        }
+        } /* End is_root.  */
+
       
       /* Take care that the chain does not get too long. */
-      depth++;
-      if (depth > maxdepth)
+      if ((depth+1) > maxdepth)
         {
-          do_list (1, lm, fp, _("certificate chain too long\n"));
+          do_list (1, listmode, listfp, _("certificate chain too long\n"));
           rc = gpg_error (GPG_ERR_BAD_CERT_CHAIN);
           goto leave;
         }
@@ -1050,8 +1304,8 @@ gpgsm_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t r_exptime,
         {
           if (rc == -1)
             {
-              do_list (0, lm, fp, _("issuer certificate not found"));
-              if (!lm)
+              do_list (0, listmode, listfp, _("issuer certificate not found"));
+              if (!listmode)
                 {
                   log_info ("issuer certificate: #/");
                   gpgsm_dump_string (issuer);
@@ -1083,7 +1337,7 @@ gpgsm_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t r_exptime,
       rc = gpgsm_check_cert_sig (issuer_cert, subject_cert);
       if (rc)
         {
-          do_list (0, lm, fp, _("certificate has a BAD signature"));
+          do_list (0, listmode, listfp, _("certificate has a BAD signature"));
           if (DBG_X509)
             {
               gpgsm_dump_cert ("signing issuer", issuer_cert);
@@ -1113,8 +1367,9 @@ gpgsm_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t r_exptime,
                     }
                   else
                     {
-                      do_list (0, lm, fp, _("found another possible matching "
-                                            "CA certificate - trying again"));
+                      do_list (0, listmode, listfp,
+                               _("found another possible matching "
+                                 "CA certificate - trying again"));
                       ksba_cert_release (issuer_cert); 
                       issuer_cert = tmp_cert;
                       goto try_another_cert;
@@ -1128,14 +1383,15 @@ gpgsm_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t r_exptime,
           goto leave;
         }
 
-      is_root = 0;
+      is_root = gpgsm_is_root_cert (issuer_cert);
       istrusted_rc = -1;
 
+
       /* Check that a CA is allowed to issue certificates. */
       {
         int chainlen;
 
-        rc = allowed_ca (issuer_cert, &chainlen, listmode, fp);
+        rc = allowed_ca (issuer_cert, &chainlen, listmode, listfp);
         if (rc)
           {
             /* Not allowed.  Check whether this is a trusted root
@@ -1146,12 +1402,11 @@ gpgsm_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t r_exptime,
                certificates carry proper BasicContraints our way of
                overriding an error in the way is justified for
                performance reasons. */
-            if (gpgsm_is_root_cert (issuer_cert))
+            if (is_root)
               {
-                is_root = 1;
                 istrusted_rc = gpgsm_agent_istrusted (ctrl, issuer_cert,
-                                                      &rootca_flags);
-                if (!istrusted_rc && rootca_flags.relax)
+                                                      rootca_flags);
+                if (!istrusted_rc && rootca_flags->relax)
                   {
                     /* Ignore the error due to the relax flag.  */
                     rc = 0;
@@ -1161,9 +1416,9 @@ gpgsm_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t r_exptime,
           }
         if (rc)
           goto leave;
-        if (chainlen >= 0 && (depth - 1) > chainlen)
+        if (chainlen >= 0 && depth > chainlen)
           {
-            do_list (1, lm, fp,
+            do_list (1, listmode, listfp,
                      _("certificate chain longer than allowed by CA (%d)"),
                      chainlen);
             rc = gpg_error (GPG_ERR_BAD_CERT_CHAIN);
@@ -1188,13 +1443,15 @@ gpgsm_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t r_exptime,
       /* Check for revocations etc.  Note that for a root certificate
          this test is done a second time later. This should eventually
          be fixed. */
-      if ((flags & 1))
+      if ((flags & VALIDATE_FLAG_NO_DIRMNGR))
         rc = 0;
       else if (is_root && (opt.no_trusted_cert_crl_check
-                           || (!istrusted_rc && rootca_flags.relax)))
-        ; 
+                           || (!istrusted_rc && rootca_flags->relax)))
+        rc = 0; 
       else
-        rc = is_cert_still_valid (ctrl, lm, fp,
+        rc = is_cert_still_valid (ctrl, 
+                                  (flags & VALIDATE_FLAG_CHAIN_MODEL),
+                                  listmode, listfp,
                                   subject_cert, issuer_cert,
                                   &any_revoked, &any_no_crl, &any_crl_too_old);
       if (rc)
@@ -1202,13 +1459,29 @@ gpgsm_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t r_exptime,
 
 
       if (opt.verbose && !listmode)
-        log_info ("certificate is good\n");
+        log_info (depth == 0 ? _("certificate is good\n") :
+                  !is_root   ? _("intermediate certificate is good\n") :
+                  /* other */  _("root certificate is good\n"));
+
+      /* Under the chain model the next check time is the creation
+         time of the subject certificate.  */
+      if ( (flags & VALIDATE_FLAG_CHAIN_MODEL) )
+        {
+          rc = ksba_cert_get_validity (subject_cert, 0, check_time);
+          if (rc)
+            {
+              /* That will never happen as we have already checked
+                 this above.  */
+              BUG ();
+            }
+        }
 
       /* For the next round the current issuer becomes the new subject.  */
       keydb_search_reset (kh);
       ksba_cert_release (subject_cert);
       subject_cert = issuer_cert;
       issuer_cert = NULL;
+      depth++;
     } /* End chain traversal. */
 
   if (!listmode)
@@ -1238,7 +1511,7 @@ gpgsm_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t r_exptime,
   
  leave:
   /* If we have traversed a complete chain up to the root we will
-     reset the ephemeral flag for all these certificates.  his is done
+     reset the ephemeral flag for all these certificates.  This is done
      regardless of any error because those errors may only be
      transient. */
   if (chain && chain->is_root)
@@ -1306,6 +1579,61 @@ gpgsm_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t r_exptime,
 }
 
 
+/* Validate a certifcate chain.  For a description see the
+   do_validate_chain.  This function is a wrapper to handle a root
+   certificate with the chain_model flag set.  If RETFLAGS is not
+   NULL, flags indicating now the verification was done are stored
+   there.  The only defined flag for RETFLAGS is
+   VALIDATE_FLAG_CHAIN_MODEL.
+
+   If you are verifying a signature you should set CHECKTIME to the
+   creation time of the signature.  If your are verifying a
+   certificate, set it nil (i.e. the empty string).  If the creation
+   date of the signature is not known use the special date
+   "19700101T000000" which is treated in a special way here. */
+int
+gpgsm_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t checktime,
+                      ksba_isotime_t r_exptime,
+                      int listmode, estream_t listfp, unsigned int flags,
+                      unsigned int *retflags)
+{
+  int rc;
+  struct rootca_flags_s rootca_flags;
+  unsigned int dummy_retflags;
+
+  if (!retflags)
+    retflags = &dummy_retflags;
+
+  if (ctrl->validation_model == 1)
+    flags |= VALIDATE_FLAG_CHAIN_MODEL;
+
+  *retflags = (flags & VALIDATE_FLAG_CHAIN_MODEL);
+  memset (&rootca_flags, 0, sizeof rootca_flags);
+
+  rc = do_validate_chain (ctrl, cert, checktime, 
+                          r_exptime, listmode, listfp, flags,
+                          &rootca_flags);
+  if (gpg_err_code (rc) == GPG_ERR_CERT_EXPIRED
+      && !(flags & VALIDATE_FLAG_CHAIN_MODEL)
+      && (rootca_flags.valid && rootca_flags.chain_model))
+    {
+      do_list (0, listmode, listfp, _("switching to chain model"));
+      rc = do_validate_chain (ctrl, cert, checktime,
+                              r_exptime, listmode, listfp, 
+                              (flags |= VALIDATE_FLAG_CHAIN_MODEL),
+                              &rootca_flags);
+      *retflags |= VALIDATE_FLAG_CHAIN_MODEL;
+    }
+
+  if (opt.verbose)
+    do_list (0, listmode, listfp, _("validation model used: %s"), 
+             (*retflags & VALIDATE_FLAG_CHAIN_MODEL)?
+             _("chain model"):_("shell model"));
+  
+  return rc;
+}
+
+
 /* Check that the given certificate is valid but DO NOT check any
    constraints.  We assume that the issuers certificate is already in
    the DB and that this one is valid; which it should be because it
@@ -1399,7 +1727,7 @@ gpgsm_basic_cert_check (ksba_cert_t cert)
           goto leave;
         }
       if (opt.verbose)
-        log_info ("certificate is good\n");
+        log_info (_("certificate is good\n"));
     }
 
  leave:
diff --git a/sm/certcheck.c b/sm/certcheck.c
index 5375408ac..7f26f80dc 100644
--- a/sm/certcheck.c
+++ b/sm/certcheck.c
@@ -343,13 +343,17 @@ gpgsm_check_cert_sig (ksba_cert_t issuer_cert, ksba_cert_t cert)
 
 int
 gpgsm_check_cms_signature (ksba_cert_t cert, ksba_const_sexp_t sigval,
-                           gcry_md_hd_t md, int algo)
+                           gcry_md_hd_t md, int mdalgo, int *r_pkalgo)
 {
   int rc;
   ksba_sexp_t p;
   gcry_mpi_t frame;
   gcry_sexp_t s_sig, s_hash, s_pkey;
   size_t n;
+  int pkalgo;
+
+  if (r_pkalgo)
+    *r_pkalgo = 0;
 
   n = gcry_sexp_canon_len (sigval, 0, NULL, NULL);
   if (!n)
@@ -385,8 +389,10 @@ gpgsm_check_cms_signature (ksba_cert_t cert, ksba_const_sexp_t sigval,
       return rc;
     }
 
-
-  rc = do_encode_md (md, algo, pk_algo_from_sexp (s_pkey),
+  pkalgo = pk_algo_from_sexp (s_pkey);
+  if (r_pkalgo)
+    *r_pkalgo = pkalgo;
+  rc = do_encode_md (md, mdalgo, pkalgo,
                      gcry_pk_get_nbits (s_pkey), s_pkey, &frame);
   if (rc)
     {
diff --git a/sm/certdump.c b/sm/certdump.c
index b8f35286a..c8b9958ae 100644
--- a/sm/certdump.c
+++ b/sm/certdump.c
@@ -71,10 +71,10 @@ gpgsm_print_serial (estream_t fp, ksba_const_sexp_t sn)
       p++;
       n = strtoul (p, &endp, 10);
       p = endp;
-      if (*p!=':')
+      if (*p++ != ':')
         es_fputs ("[Internal Error - invalid S-expression]", fp);
       else
-        es_write_hexstring (fp, p, strlen (p), 0, NULL);
+        es_write_hexstring (fp, p, n, 0, NULL);
     }
 }
 
@@ -936,7 +936,7 @@ gpgsm_format_keydesc (ksba_cert_t cert)
                  _("Please enter the passphrase to unlock the"
                    " secret key for:\n"
                    "\"%s\"\n"
-                   "S/N %s, ID %08lX, created %s" ),
+                   "S/N %s, ID 0x%08lX, created %s" ),
                  subject? subject:"?",
                  sn? sn: "?",
                  gpgsm_get_short_fingerprint (cert),
diff --git a/sm/certlist.c b/sm/certlist.c
index e7112f39f..5c08e317c 100644
--- a/sm/certlist.c
+++ b/sm/certlist.c
@@ -374,7 +374,8 @@ gpgsm_add_to_certlist (ctrl_t ctrl, const char *name, int secret,
                     }
                 }
               if (!rc)
-                rc = gpgsm_validate_chain (ctrl, cert, NULL, 0, NULL, 0);
+                rc = gpgsm_validate_chain (ctrl, cert, "", NULL,
+                                           0, NULL, 0, NULL);
               if (!rc)
                 {
                   certlist_t cl = xtrycalloc (1, sizeof *cl);
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 3a1c6d811..69f1532fd 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -195,6 +195,7 @@ enum cmd_and_opt_values {
   oSetFilename,
   oSetPolicyURL,
   oUseEmbeddedFilename,
+  oValidationModel,
   oComment,
   oDefaultComment,
   oThrowKeyid,
@@ -302,6 +303,8 @@ static ARGPARSE_OPTS opts[] = {
     { oDisableOCSP, "disable-ocsp", 0, "@" },
     { oEnableOCSP,  "enable-ocsp", 0, N_("check validity using OCSP")},
 
+    { oValidationModel, "validation-model", 2, "@"},
+
     { oIncludeCerts, "include-certs", 1,
                                  N_("|N|number of certificates to include") },
 
@@ -423,7 +426,7 @@ static ARGPARSE_OPTS opts[] = {
     { oLCmessages, "lc-messages", 2, "@" },
     { oDirmngrProgram, "dirmngr-program", 2 , "@" },
     { oProtectToolProgram, "protect-tool-program", 2 , "@" },
-    { oFakedSystemTime, "faked-system-time", 4, "@" }, /* (epoch time) */
+    { oFakedSystemTime, "faked-system-time", 2, "@" }, /* (epoch time) */
 
 
     { oNoBatch, "no-batch", 0, "@" },
@@ -472,6 +475,8 @@ static int allow_special_filenames;
 /* Default value for include-certs. */
 static int default_include_certs = 1; /* Only include the signer's cert. */
 
+/* Whether the chain mode shall be used for validation.  */
+static int default_validation_model;
 
 
 static char *build_list (const char *text,
@@ -700,6 +705,17 @@ do_add_recipient (ctrl_t ctrl, const char *name,
 }
 
 
+static void
+parse_validation_model (const char *model)
+{
+  int i = gpgsm_parse_validation_model (model);
+  if (i == -1)
+    log_error (_("unknown validation model `%s'\n"), model);
+  else
+    default_validation_model = i;
+}
+
+
 int
 main ( int argc, char **argv)
 {
@@ -772,9 +788,6 @@ main ( int argc, char **argv)
   opt.def_cipher_algoid = "3DES";  /*des-EDE3-CBC*/
 
   opt.homedir = default_homedir ();
-#ifdef HAVE_W32_SYSTEM
-  opt.no_crl_check = 1;
-#endif
 
   /* First check whether we have a config file on the commandline */
   orig_argc = argc;
@@ -1095,7 +1108,12 @@ main ( int argc, char **argv)
           break;
           
         case oFakedSystemTime:
-          gnupg_set_time ( (time_t)pargs.r.ret_ulong, 0);
+          {
+            time_t faked_time = isotime2epoch (pargs.r.ret_str); 
+            if (faked_time == (time_t)(-1))
+              faked_time = (time_t)strtoul (pargs.r.ret_str, NULL, 10);
+            gnupg_set_time (faked_time, 0);
+          }
           break;
 
         case oNoDefKeyring: default_keyring = 0; break;
@@ -1174,7 +1192,8 @@ main ( int argc, char **argv)
         case oNoRandomSeedFile: use_random_seed = 0; break;
 
         case oEnableSpecialFilenames: allow_special_filenames =1; break;
-          
+
+        case oValidationModel: parse_validation_model (pargs.r.ret_str); break;
 
         case aDummy:
           break;
@@ -1201,7 +1220,11 @@ main ( int argc, char **argv)
 
   if (log_get_errorcount(0))
     gpgsm_exit(2);
-  
+
+  /* Now that we have the optiosn parsed we need to update the default
+     control structure.  */
+  gpgsm_init_default_ctrl (&ctrl);
+
   if (nogreeting)
     greeting = 0;
   
@@ -1715,9 +1738,21 @@ gpgsm_init_default_ctrl (struct server_control_s *ctrl)
 {
   ctrl->include_certs = default_include_certs;
   ctrl->use_ocsp = opt.enable_ocsp;
+  ctrl->validation_model = default_validation_model;
 }
 
 
+int
+gpgsm_parse_validation_model (const char *model)
+{     
+  if (!ascii_strcasecmp (model, "shell") )
+    return 0;
+  else if ( !ascii_strcasecmp (model, "chain") )
+    return 1;
+  else
+    return -1;
+}
+
 
 /* Check whether the filename has the form "-&nnnn", where n is a
    non-zero number.  Returns this number or -1 if it is not the case.  */
diff --git a/sm/gpgsm.h b/sm/gpgsm.h
index 5a41a3d5d..108c4fe43 100644
--- a/sm/gpgsm.h
+++ b/sm/gpgsm.h
@@ -164,6 +164,7 @@ struct server_control_s
                          certificates up the chain (0 = none, 1 = only
                          signer) */
   int use_ocsp;       /* Set to true if OCSP should be used. */
+  int validation_model; /* Set to 1 for the chain model.  */
 };
 
 
@@ -185,8 +186,10 @@ typedef struct certlist_s *certlist_t;
 /* A structure carrying information about trusted root certificates. */
 struct rootca_flags_s
 {
+  unsigned int valid:1;  /* The rest of the structure has valid
+                            information.  */
   unsigned int relax:1;  /* Relax checking of root certificates.  */
-
+  unsigned int chain_model:1; /* Root requires the use of the chain model.  */
 };
 
 
@@ -194,6 +197,7 @@ struct rootca_flags_s
 /*-- gpgsm.c --*/
 void gpgsm_exit (int rc);
 void gpgsm_init_default_ctrl (struct server_control_s *ctrl);
+int  gpgsm_parse_validation_model (const char *model);
 
 /*-- server.c --*/
 void gpgsm_server (certlist_t default_recplist);
@@ -253,7 +257,7 @@ char *gpgsm_format_keydesc (ksba_cert_t cert);
 /*-- certcheck.c --*/
 int gpgsm_check_cert_sig (ksba_cert_t issuer_cert, ksba_cert_t cert);
 int gpgsm_check_cms_signature (ksba_cert_t cert, ksba_const_sexp_t sigval,
-                               gcry_md_hd_t md, int hash_algo);
+                               gcry_md_hd_t md, int hash_algo, int *r_pkalgo);
 /* fixme: move create functions to another file */
 int gpgsm_create_cms_signature (ctrl_t ctrl,
                                 ksba_cert_t cert, gcry_md_hd_t md, int mdalgo,
@@ -261,12 +265,19 @@ int gpgsm_create_cms_signature (ctrl_t ctrl,
 
 
 /*-- certchain.c --*/
+
+/* Flags used with  gpgsm_validate_chain.  */
+#define VALIDATE_FLAG_NO_DIRMNGR  1
+#define VALIDATE_FLAG_CHAIN_MODEL 2
+
+
 int gpgsm_walk_cert_chain (ksba_cert_t start, ksba_cert_t *r_next);
 int gpgsm_is_root_cert (ksba_cert_t cert);
 int gpgsm_validate_chain (ctrl_t ctrl, ksba_cert_t cert,
+                          ksba_isotime_t checktime,
                           ksba_isotime_t r_exptime,
                           int listmode, estream_t listfp,
-                          unsigned int flags);
+                          unsigned int flags, unsigned int *retflags);
 int gpgsm_basic_cert_check (ksba_cert_t cert);
 
 /*-- certlist.c --*/
diff --git a/sm/import.c b/sm/import.c
index deebccfbc..8d42c9272 100644
--- a/sm/import.c
+++ b/sm/import.c
@@ -173,7 +173,7 @@ check_and_store (ctrl_t ctrl, struct stats_s *stats,
   */
   rc = gpgsm_basic_cert_check (cert);
   if (!rc && ctrl->with_validation)
-    rc = gpgsm_validate_chain (ctrl, cert, NULL, 0, NULL, 0);
+    rc = gpgsm_validate_chain (ctrl, cert, "", NULL, 0, NULL, 0, NULL);
   if (!rc || (!ctrl->with_validation
               && gpg_err_code (rc) == GPG_ERR_MISSING_CERT) )
     {
diff --git a/sm/keylist.c b/sm/keylist.c
index 9ec7cd137..604f9d986 100644
--- a/sm/keylist.c
+++ b/sm/keylist.c
@@ -176,6 +176,9 @@ static struct
   /* GnuPG extensions */
   { "1.3.6.1.4.1.11591.2.1.1", "pkaAddress" },
 
+  /* Extensions used by the Bundesnetzagentur.  */
+  { "1.3.6.1.4.1.8301.3.5", "validityModel" },
+
   { NULL }
 };
 
@@ -345,9 +348,10 @@ list_cert_colon (ctrl_t ctrl, ksba_cert_t cert, unsigned int validity,
   const char *chain_id;
   char *chain_id_buffer = NULL;
   int is_root = 0;
+  char *kludge_uid;
 
   if (ctrl->with_validation)
-    valerr = gpgsm_validate_chain (ctrl, cert, NULL, 1, NULL, 0);
+    valerr = gpgsm_validate_chain (ctrl, cert, "", NULL, 1, NULL, 0, NULL);
   else
     valerr = 0;
 
@@ -484,8 +488,15 @@ list_cert_colon (ctrl_t ctrl, ksba_cert_t cert, unsigned int validity,
       print_key_data (cert, fp);
     }
 
+  kludge_uid = NULL;
   for (idx=0; (p = ksba_cert_get_subject (cert,idx)); idx++)
     {
+      /* In the case that the same email address is in the subecj DN
+         as weel as in an alternate subject name we avoid printing it
+         a second time. */
+      if (kludge_uid && !strcmp (kludge_uid, p))
+        continue;
+
       es_fprintf (fp, "uid:%s::::::::", truststring);
       es_write_sanitized (fp, p, strlen (p), ":", NULL);
       es_putc (':', fp);
@@ -497,19 +508,20 @@ list_cert_colon (ctrl_t ctrl, ksba_cert_t cert, unsigned int validity,
              the keydb.  But as long as we don't have a way to pass
              the meta data back, we just check it the same way as the
              code used to create the keybox meta data does */
-          char *pp = email_kludge (p);
-          if (pp)
+          kludge_uid = email_kludge (p);
+          if (kludge_uid)
             {
               es_fprintf (fp, "uid:%s::::::::", truststring);
-              es_write_sanitized (fp, pp, strlen (pp), ":", NULL);
+              es_write_sanitized (fp, kludge_uid, strlen (kludge_uid),
+                                  ":", NULL);
               es_putc (':', fp);
               es_putc (':', fp);
               es_putc ('\n', fp);
-              xfree (pp);
             }
         }
       xfree (p);
     }
+  xfree (kludge_uid);
 }
 
 
@@ -570,8 +582,11 @@ list_cert_raw (ctrl_t ctrl, KEYDB_HANDLE hd,
   ksba_name_t name, name2;
   unsigned int reason;
 
+  es_fprintf (fp, "           ID: 0x%08lX\n",
+              gpgsm_get_short_fingerprint (cert));
+
   sexp = ksba_cert_get_serial (cert);
-  es_fputs ("Serial number: ", fp);
+  es_fputs ("          S/N: ", fp);
   gpgsm_print_serial (fp, sexp);
   ksba_free (sexp);
   es_putc ('\n', fp);
@@ -887,7 +902,7 @@ list_cert_raw (ctrl_t ctrl, KEYDB_HANDLE hd,
 
   if (with_validation)
     {
-      err = gpgsm_validate_chain (ctrl, cert, NULL, 1, fp, 0);
+      err = gpgsm_validate_chain (ctrl, cert, "", NULL, 1, fp, 0, NULL);
       if (!err)
         es_fprintf (fp, "  [certificate is good]\n");
       else
@@ -924,8 +939,11 @@ list_cert_std (ctrl_t ctrl, ksba_cert_t cert, estream_t fp, int have_secret,
   unsigned int kusage;
   char *string, *p, *pend;
 
+  es_fprintf (fp, "           ID: 0x%08lX\n",
+              gpgsm_get_short_fingerprint (cert));
+
   sexp = ksba_cert_get_serial (cert);
-  es_fputs ("Serial number: ", fp);
+  es_fputs ("          S/N: ", fp);
   gpgsm_print_serial (fp, sexp);
   ksba_free (sexp);
   es_putc ('\n', fp);
@@ -1088,7 +1106,7 @@ list_cert_std (ctrl_t ctrl, ksba_cert_t cert, estream_t fp, int have_secret,
       size_t buflen;
       char buffer[1];
       
-      err = gpgsm_validate_chain (ctrl, cert, NULL, 1, fp, 0);
+      err = gpgsm_validate_chain (ctrl, cert, "", NULL, 1, fp, 0, NULL);
       tmperr = ksba_cert_get_user_data (cert, "is_qualified", 
                                         &buffer, sizeof (buffer), &buflen);
       if (!tmperr && buflen)
diff --git a/sm/server.c b/sm/server.c
index 9896728aa..34326c5eb 100644
--- a/sm/server.c
+++ b/sm/server.c
@@ -244,6 +244,14 @@ option_handler (assuan_context_t ctx, const char *key, const char *value)
       int i = *value? atoi (value) : 0;
       ctrl->with_validation = i;
     }
+  else if (!strcmp (key, "validation-model"))
+    {
+      int i = gpgsm_parse_validation_model (value);
+      if ( i >= 0 && i <= 1 )
+        ctrl->validation_model = i;
+      else
+        return gpg_error (GPG_ERR_ASS_PARAMETER);
+    }
   else if (!strcmp (key, "with-key-data"))
     {
       opt.with_key_data = 1;
diff --git a/sm/sign.c b/sm/sign.c
index a8908cf62..d617e7239 100644
--- a/sm/sign.c
+++ b/sm/sign.c
@@ -380,7 +380,7 @@ gpgsm_sign (ctrl_t ctrl, certlist_t signerlist,
          check that the signer's certificate is usable and valid.  */
       rc = gpgsm_cert_use_sign_p (cert);
       if (!rc)
-        rc = gpgsm_validate_chain (ctrl, cert, NULL, 0, NULL, 0);
+        rc = gpgsm_validate_chain (ctrl, cert, "", NULL, 0, NULL, 0, NULL);
       if (rc)
         goto leave;
 
diff --git a/sm/verify.c b/sm/verify.c
index e44568872..4e92c11d8 100644
--- a/sm/verify.c
+++ b/sm/verify.c
@@ -1,5 +1,5 @@
 /* verify.c - Verify a messages signature
- *	Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2003, 2007 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -246,6 +246,8 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp)
       char *msgdigest = NULL;
       size_t msgdigestlen;
       char *ctattr;
+      int info_pkalgo;
+      unsigned int verifyflags;
 
       rc = ksba_cms_get_issuer_serial (cms, signer, &issuer, &serial);
       if (!signer && gpg_err_code (rc) == GPG_ERR_NO_DATA
@@ -388,7 +390,7 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp)
         gpgsm_dump_time (sigtime);
       else
         log_printf (_("[date not given]"));
-      log_printf (_(" using certificate ID %08lX\n"),
+      log_printf (_(" using certificate ID 0x%08lX\n"),
                   gpgsm_get_short_fingerprint (cert));
 
 
@@ -432,12 +434,14 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp)
               gcry_md_close (md);
               goto next_signer;
             }
-          rc = gpgsm_check_cms_signature (cert, sigval, md, algo);
+          rc = gpgsm_check_cms_signature (cert, sigval, md, algo, 
+                                          &info_pkalgo);
           gcry_md_close (md);
         }
       else
         {
-          rc = gpgsm_check_cms_signature (cert, sigval, data_md, algo);
+          rc = gpgsm_check_cms_signature (cert, sigval, data_md, algo, 
+                                          &info_pkalgo);
         }
 
       if (rc)
@@ -460,7 +464,10 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp)
 
       if (DBG_X509)
         log_debug ("signature okay - checking certs\n");
-      rc = gpgsm_validate_chain (ctrl, cert, keyexptime, 0, NULL, 0);
+      rc = gpgsm_validate_chain (ctrl, cert,
+                                 *sigtime? sigtime : "19700101T000000",
+                                 keyexptime, 0, 
+                                 NULL, 0, &verifyflags);
       {
         char *fpr, *buf, *tstr;
 
@@ -477,10 +484,10 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp)
 
         fpr = gpgsm_get_fingerprint_hexstring (cert, GCRY_MD_SHA1);
         tstr = strtimestamp_r (sigtime);
-        buf = xmalloc ( strlen(fpr) + strlen (tstr) + 120);
-        sprintf (buf, "%s %s %s %s", fpr, tstr,
-                 *sigtime? sigtime : "0",
-                 *keyexptime? keyexptime : "0" );
+        buf = xasprintf ("%s %s %s %s 0 0 %d %d 00", fpr, tstr,
+                         *sigtime? sigtime : "0",
+                         *keyexptime? keyexptime : "0",
+                         info_pkalgo, algo);
         xfree (tstr);
         xfree (fpr);
         gpgsm_status (ctrl, STATUS_VALIDSIG, buf);
@@ -512,7 +519,32 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp)
           ksba_free (p);
         }
 
-      gpgsm_status (ctrl, STATUS_TRUST_FULLY, NULL);
+      /* Print a note if this is a qualified signature.  */
+      {
+        size_t qualbuflen;
+        char qualbuffer[1];
+        
+        rc = ksba_cert_get_user_data (cert, "is_qualified", &qualbuffer,
+                                      sizeof (qualbuffer), &qualbuflen);
+        if (!rc && qualbuflen)
+          {
+            if (*qualbuffer)
+              {
+                log_info (_("This is a qualified signature\n"));
+                if (!opt.qualsig_approval)
+                  log_info 
+                    (_("Note, that this software is not officially approved "
+                       "to create or verify such signatures.\n"));
+              }
+          }    
+        else if (gpg_err_code (rc) != GPG_ERR_NOT_FOUND)
+          log_error ("get_user_data(is_qualified) failed: %s\n",
+                     gpg_strerror (rc)); 
+      }
+
+      gpgsm_status (ctrl, STATUS_TRUST_FULLY, 
+                    (verifyflags & VALIDATE_FLAG_CHAIN_MODEL)?
+                    "0 chain": "0 shell");
           
 
     next_signer: